diff options
Diffstat (limited to 'src')
6 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/designercore/include/variantproperty.h b/src/plugins/qmldesigner/designercore/include/variantproperty.h index c909958de0..8f25ab3109 100644 --- a/src/plugins/qmldesigner/designercore/include/variantproperty.h +++ b/src/plugins/qmldesigner/designercore/include/variantproperty.h @@ -27,7 +27,8 @@ #include "qmldesignercorelib_global.h" #include "abstractproperty.h" -#include "enumeration.h" + +#include <enumeration.h> QT_BEGIN_NAMESPACE class QTextStream; diff --git a/src/plugins/qmldesigner/designercore/model/propertyparser.cpp b/src/plugins/qmldesigner/designercore/model/propertyparser.cpp index c6d19b801a..b4af856467 100644 --- a/src/plugins/qmldesigner/designercore/model/propertyparser.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertyparser.cpp @@ -24,7 +24,8 @@ ****************************************************************************/ #include "propertyparser.h" -#include "enumeration.h" + +#include <enumeration.h> #include <modelnode.h> #include <metainfo.h> diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index ea72cc51a2..45c07d20af 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -29,7 +29,6 @@ #include "modelnodepositionstorage.h" #include "abstractproperty.h" #include "bindingproperty.h" -#include "enumeration.h" #include "filemanager/firstdefinitionfinder.h" #include "filemanager/objectlengthcalculator.h" #include "filemanager/qmlrefactoring.h" @@ -42,6 +41,8 @@ #include "rewriterview.h" #include "variantproperty.h" +#include <enumeration.h> + #include <qmljs/qmljsevaluate.h> #include <qmljs/qmljslink.h> #include <qmljs/parser/qmljsast_p.h> diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs index 4cba901e20..2db56446f3 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.qbs +++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs @@ -192,7 +192,6 @@ Project { "interfaces/nodeinstanceclientinterface.h", "interfaces/nodeinstanceserverinterface.cpp", "interfaces/nodeinstanceserverinterface.h", - "types/enumeration.cpp", "types/enumeration.h", ] } diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt index a5b24d59de..3715ae9349 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -126,7 +126,7 @@ extend_qtc_executable(qml2puppet extend_qtc_executable(qml2puppet SOURCES_PREFIX "${SRCDIR}/types" SOURCES - enumeration.cpp enumeration.h + enumeration.h ) extend_qtc_executable(qml2puppet diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs index 25c3f39309..02a6f6e31f 100644 --- a/src/tools/qml2puppet/qml2puppet.qbs +++ b/src/tools/qml2puppet/qml2puppet.qbs @@ -121,7 +121,6 @@ QtcTool { "interfaces/nodeinstanceserverinterface.cpp", "interfaces/nodeinstanceserverinterface.h", "qmlprivategate/qmlprivategate.h", - "types/enumeration.cpp", "types/enumeration.h", ] } |