mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-01 15:11:31 +00:00
Code Issues Releases Wiki Activity

Fix Qt4 build

Browse source
This commit is contained in:
Kyle Cooley 2017-09-22 23:33:50 -04:00
parent 3981f79d38
commit 1fe1ec63c4
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/opencs/model/world/columnimp.hpp
View file

@ -2537,4 +2537,11 @@ namespace CSMWorld
}; };
} }
// This is required to access the type as a QVariant.
Q_DECLARE_METATYPE(CSMWorld::LandMapLodColumn::DataType)
//Q_DECLARE_METATYPE(CSMWorld::LandNormalsColumn::DataType) // Same as LandMapLodColumn::DataType
Q_DECLARE_METATYPE(CSMWorld::LandHeightsColumn::DataType)
Q_DECLARE_METATYPE(CSMWorld::LandColoursColumn::DataType)
Q_DECLARE_METATYPE(CSMWorld::LandTexturesColumn::DataType)
#endif #endif

5
apps/opencs/model/world/commands.hpp
View file

@ -3,17 +3,16 @@
#include "record.hpp" #include "record.hpp"
#include <cstdint>
#include <string> #include <string>
#include <map> #include <map>
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <QVariant> #include <QVariant>
#include <QVector>
#include <QUndoCommand> #include <QUndoCommand>
#include <QModelIndex> #include <QModelIndex>
#include "columnimp.hpp"
#include "universalid.hpp" #include "universalid.hpp"
#include "nestedtablewrapper.hpp" #include "nestedtablewrapper.hpp"
@ -57,7 +56,7 @@ namespace CSMWorld
protected: protected:
using DataType = QVector<uint16_t>; using DataType = LandTexturesColumn::DataType;
virtual const std::string& getOriginId() const = 0; virtual const std::string& getOriginId() const = 0;
virtual const std::string& getDestinationId() const = 0; virtual const std::string& getDestinationId() const = 0;