diff --git a/qtcreator.pro b/qtcreator.pro index d6ee82b50b8e429527dea538ce3f16453ad93421..e3aeb6950d263a293233927643611110053567ee 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -11,3 +11,4 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = src share +WITH_TESTS:SUBDIRS += tests diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri index 7554994991b3acd9972271d7722743d2094c3726..50a03111e98361830d15b080d73a9e95388c1d0b 100644 --- a/src/libs/cplusplus/cplusplus.pri +++ b/src/libs/cplusplus/cplusplus.pri @@ -1,3 +1,3 @@ -INCLUDEPATH += $$PWD/../../shared/cplusplus -DEPENDPATH += $$PWD/../../shared/cplusplus +INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus +DEPENDPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus LIBS *= -l$$qtLibraryTarget(CPlusPlus) diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro index 99a6216b46faefe4db52ed1545e65ed049c3c548..e4755e63f930ab0c59e92c7197b7c310673773ed 100644 --- a/src/plugins/cppeditor/cppeditor.pro +++ b/src/plugins/cppeditor/cppeditor.pro @@ -2,8 +2,9 @@ TEMPLATE = lib TARGET = CppEditor DEFINES += CPPEDITOR_LIBRARY include(../../qtcreatorplugin.pri) -include(../../libs/utils/utils.pri) -include(../../shared/indenter/indenter.pri) +include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) +include($$IDE_SOURCE_TREE/src/shared/indenter/indenter.pri) +include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri) include(cppeditor_dependencies.pri) HEADERS += cppplugin.h \ cppeditor.h \ diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index 5659604141a0a3431382e9cf5b7c37292dc0a072..0d9ec4b1d317c9c3ea76f64028ba6746d9c90367 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -235,7 +235,7 @@ private: }; #endif -class CppPreprocessor: public CPlusPlus::Client +class CPPTOOLS_EXPORT CppPreprocessor: public CPlusPlus::Client { public: #ifndef ICHECK_BUILD diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro index 6ab11b6058ce35ce2d4a928cb0aefe860fefb80d..9382bcb5cf7f2bb150a6f20f5600f017784e2c28 100644 --- a/src/plugins/cpptools/cpptools.pro +++ b/src/plugins/cpptools/cpptools.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = CppTools include(../../qtcreatorplugin.pri) -include(../../plugins/locator/locator.pri) +include($$IDE_SOURCE_TREE/src/plugins/locator/locator.pri) include(cpptools_dependencies.pri) # DEFINES += QT_NO_CAST_FROM_ASCII diff --git a/src/plugins/cpptools/cpptools_dependencies.pri b/src/plugins/cpptools/cpptools_dependencies.pri index e12a33bc465bc8ef748356bb310e9de0a2593c84..7ac540da28b664fff0a7323028a79c1c94d675cc 100644 --- a/src/plugins/cpptools/cpptools_dependencies.pri +++ b/src/plugins/cpptools/cpptools_dependencies.pri @@ -1,3 +1,3 @@ -include(../../libs/cplusplus/cplusplus.pri) -include(../../plugins/projectexplorer/projectexplorer.pri) -include(../../plugins/texteditor/texteditor.pri) +include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri) +include($$IDE_SOURCE_TREE/src/plugins/projectexplorer/projectexplorer.pri) +include($$IDE_SOURCE_TREE/src/plugins/texteditor/texteditor.pri) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 94b0034402fe64d79138bd8eecd2b024d5521f5d..9b51ff0f978167f5d36805ea7bb2f9987a2f495e 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -7,7 +7,7 @@ SUBDIRS += \ # profilereader \ aggregation \ changeset \ - icheckbuild \ +# icheckbuild \ generichighlighter contains (QT_CONFIG, declarative) { diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri index 9b173daa6137a0b88ef93efd124971a6015ff365..fcf8d810f5a6383c5679891b3534d3f319899f88 100644 --- a/tests/auto/cplusplus/shared/shared.pri +++ b/tests/auto/cplusplus/shared/shared.pri @@ -1,5 +1,5 @@ DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB -INCLUDEPATH += $$PWD/../../../../src/shared/cplusplus -INCLUDEPATH += $$PWD/../../../../src/libs/cplusplus -DEPENDPATH += $$INCLUDEPATH . -LIBS += -L$$PWD -lCPlusPlusTestSupport +include(../../../../qtcreator.pri) +include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri) +INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus +LIBS += -L$$OUT_PWD diff --git a/tests/auto/cplusplus/shared/shared.pro b/tests/auto/cplusplus/shared/shared.pro index 72f904a9799db52796095fd78547fd86bb710d9c..5d8a16554513facea184a58a77c16b25e7689f59 100644 --- a/tests/auto/cplusplus/shared/shared.pro +++ b/tests/auto/cplusplus/shared/shared.pro @@ -1,8 +1,6 @@ - TEMPLATE = lib TARGET = CPlusPlusTestSupport CONFIG += static depend_includepath QT = core gui DESTDIR = $$PWD -include($$PWD/../../../../src/libs/cplusplus/cplusplus-lib.pri) - +include($$PWD/../../../../src/libs/cplusplus/cplusplus.pri) diff --git a/tests/auto/icheckbuild/icheckbuild.pro b/tests/auto/icheckbuild/icheckbuild.pro index 28160f2ece46fdda86fc018621e927d05acd2408..6efeda9e835deea2db527f7fe1ca1fe271f946ea 100644 --- a/tests/auto/icheckbuild/icheckbuild.pro +++ b/tests/auto/icheckbuild/icheckbuild.pro @@ -1,25 +1,20 @@ -REL_PATH_TO_SRC = ../../../src +include(../../../qtcreator.pri) +include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri) +include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri) QT += testlib -SOURCES += \ - tst_icheckbuild.cpp - DEFINES += ICHECK_BUILD ICHECK_APP_BUILD -INCLUDEPATH += . \ - $$REL_PATH_TO_SRC/../ \ - $$REL_PATH_TO_SRC/global \ - $$REL_PATH_TO_SRC/plugins \ - $$REL_PATH_TO_SRC/libs \ - $$REL_PATH_TO_SRC/shared/cplusplus \ - $$REL_PATH_TO_SRC/libs/cplusplus +INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins +LIBS += $$IDE_SOURCE_TREE/lib/qtcreator/plugins TARGET=tst_$$TARGET -include(./ichecklib.pri) -HEADERS += ./ichecklib.h \ - ./ichecklib_global.h \ - ./parsemanager.h -SOURCES += ./ichecklib.cpp \ - ./parsemanager.cpp +HEADERS += ichecklib.h \ + ichecklib_global.h \ + parsemanager.h +SOURCES += ichecklib.cpp \ + parsemanager.cpp \ + tst_icheckbuild.cpp diff --git a/tests/auto/icheckbuild/ichecklib.pri b/tests/auto/icheckbuild/ichecklib.pri deleted file mode 100644 index 0d1aafae9c5558ffdbcd75db4a62a433783a1f4a..0000000000000000000000000000000000000000 --- a/tests/auto/icheckbuild/ichecklib.pri +++ /dev/null @@ -1,119 +0,0 @@ -# ---------------------------------------------------- -# This file is generated by the Qt Visual Studio Add-in. -# ------------------------------------------------------ - -HEADERS += \ - $$REL_PATH_TO_SRC/shared/cplusplus/AST.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/ASTMatcher.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/ASTVisitor.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/CheckDeclaration.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/CheckDeclarator.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/CheckExpression.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/CheckName.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/CheckSpecifier.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/CheckStatement.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/Control.h \ - $$REL_PATH_TO_SRC/plugins/coreplugin/core_global.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/CoreTypes.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/CPlusPlusForwardDeclarations.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/CppBindings.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/CppDocument.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/DiagnosticClient.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/FastPreprocessor.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/FullySpecifiedType.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/CheckUndefinedSymbols.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/ASTfwd.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/LookupContext.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/ResolveExpression.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/GenTemplateInstance.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/Lexer.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/Literals.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/LiteralTable.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/Macro.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/MemoryPool.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/Name.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/NamePrettyPrinter.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/Names.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/NameVisitor.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/ObjectiveCTypeQualifiers.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/Overview.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/Parser.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/pp-cctype.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/pp-engine.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/pp-macro-expander.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/pp-scanner.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/pp.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/PreprocessorClient.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/PreprocessorEnvironment.h \ - $$REL_PATH_TO_SRC/libs/utils/qtcassert.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/Scope.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/Semantic.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/SemanticCheck.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/Symbol.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/Symbols.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/SymbolVisitor.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/Token.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/TranslationUnit.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/Type.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/TypeMatcher.h \ - $$REL_PATH_TO_SRC/libs/cplusplus/TypePrettyPrinter.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/TypeVisitor.h \ - $$REL_PATH_TO_SRC/plugins/cpptools/cpptools_global.h \ - $$REL_PATH_TO_SRC/shared/cplusplus/QtContextKeywords.h -SOURCES += \ - $$REL_PATH_TO_SRC/shared/cplusplus/AST.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/ASTMatch0.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/ASTMatcher.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/ASTClone.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/ASTVisit.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/ASTVisitor.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/CheckDeclaration.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/CheckDeclarator.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/CheckExpression.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/CheckName.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/CheckSpecifier.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/CheckStatement.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Control.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/CoreTypes.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/CppBindings.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/CppDocument.cpp \ - $$REL_PATH_TO_SRC/plugins/cpptools/cppmodelmanager.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/DiagnosticClient.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/FastPreprocessor.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/FullySpecifiedType.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/CheckUndefinedSymbols.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/LookupContext.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/ResolveExpression.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/GenTemplateInstance.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Keywords.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Lexer.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Literals.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/LiteralTable.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/Macro.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/MemoryPool.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Name.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/NamePrettyPrinter.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Names.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/NameVisitor.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/ObjectiveCAtKeywords.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/ObjectiveCTypeQualifiers.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/Overview.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Parser.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/pp-engine.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/pp-macro-expander.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/pp-scanner.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/PreprocessorClient.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/PreprocessorEnvironment.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Scope.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Semantic.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/SemanticCheck.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Symbol.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Symbols.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/SymbolVisitor.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Token.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/TranslationUnit.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/Type.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/TypeMatcher.cpp \ - $$REL_PATH_TO_SRC/libs/cplusplus/TypePrettyPrinter.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/TypeVisitor.cpp \ - $$REL_PATH_TO_SRC/shared/cplusplus/QtContextKeywords.cpp diff --git a/tests/auto/icheckbuild/parsemanager.cpp b/tests/auto/icheckbuild/parsemanager.cpp index fa65ba47e089f599893d1455d1ff2300264dafe8..34c9d5f0db3dadc9d5aeb4e217ad0875809cdf83 100644 --- a/tests/auto/icheckbuild/parsemanager.cpp +++ b/tests/auto/icheckbuild/parsemanager.cpp @@ -466,9 +466,9 @@ void ParseManager::getElements(QList<FUNCTIONITEM*> &functionlist } } #if 0 - The code for Q_DECLARE_FLAGS was wrong. It's optional, and only does a typedef. + /*The code for Q_DECLARE_FLAGS was wrong. It's optional, and only does a typedef. That means, if you do the typedef yourself and not use Q_DECLARE_FLAGS, that *is* valid. - Meaning, if one would want to do a check like the ones in this app, one has to check the defined types in the class scope. + Meaning, if one would want to do a check like the ones in this app, one has to check the defined types in the class scope.*/ else { /**************** Q_DECLARE_FLAGS diff --git a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro index 33e3634f2079693099ab46f767c40c5555794914..713ef373b63ce70e8ae3213015d991c905c52932 100644 --- a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro +++ b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro @@ -1,18 +1,11 @@ -include(../../../../../src/plugins/qmldesigner/config.pri) +include(../../../../../qtcreator.pri) +#include(../../../../../src/plugins/qmldesigner/config.pri) QT += testlib -DESTDIR = $$DESIGNER_BINARY_DIRECTORY -include(../../../../../src/plugins/qmldesigner/designercore/designercore.pri) -include(../../../../../src/libs/qmljs/qmljs-lib.pri) -HEADERS+=../../../../../src/libs/utils/changeset.h -SOURCES+=../../../../../src/libs/utils/changeset.cpp -INCLUDEPATH+=../../../../../src/libs -DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB - ##DEFINES += DONT_MESS_WITH_QDEBUG DEPENDPATH += .. -DEPENDPATH += ../../../../../src/plugins/qmldesigner/core/include +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include TARGET = tst_bauhaus CONFIG += console diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro index a8e7b551f8e601abbd83f20ff1cbcc8b3d830ae3..2aa0380e74c9d4f091a6051246f0e88efa1378ef 100644 --- a/tests/auto/qml/qmldesigner/coretests/coretests.pro +++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro @@ -1,23 +1,23 @@ -CREATORDIR=$$PWD/../../../../.. +include(../../../../../qtcreator.pri) + +include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri) -include($$CREATORDIR/src/plugins/qmldesigner/config.pri) QT += testlib \ script \ declarative -include($$CREATORDIR/src/plugins/qmldesigner/designercore/designercore.pri) -include($$CREATORDIR/src/libs/qmljs/qmljs-lib.pri) -HEADERS+=$$CREATORDIR/src/libs/utils/changeset.h -SOURCES+=$$CREATORDIR/src/libs/utils/changeset.cpp - -INCLUDEPATH+=$$CREATORDIR/src/libs - -DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB QTCREATOR_TEST +# DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB DEFINES+=QTCREATORDIR=\\\"$$CREATORDIR\\\" -DEFINES+=QT_CREATOR +DEFINES+=QT_CREATOR QTCREATOR_TEST DEPENDPATH += .. -DEPENDPATH += $$CREATORDIR/src/plugins/qmldesigner/designercore/include +DEPENDPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore + +include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri) +include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) +include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri) TARGET = tst_qmldesigner_core diff --git a/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp b/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp index eb3cf27b80b1d8a3ef7e8c8a630c5af9c99add6d..3318b5ff0fff8b063e442cd1aa35fff1095a22cf 100644 --- a/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp +++ b/tests/auto/qml/qmldesigner/coretests/testrewriterview.cpp @@ -27,10 +27,9 @@ ** **************************************************************************/ -#include "abstractproperty.h" -#include "nodeproperty.h" #include "testrewriterview.h" #include <QObject> +#include <nodeproperty.h> using namespace QmlDesigner; using namespace QmlDesigner::Internal; diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro index 6e387052ea82916a63900c63ac5c7c38b90e4654..3da572999b2fa39499d547d74fd9ab5d8cdd0fb9 100644 --- a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro +++ b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro @@ -1,21 +1,25 @@ -include(../../../../../src/plugins/qmldesigner/config.pri) -include(../../../../../src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri) +include(../../../../../qtcreator.pri) +include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri) +# include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri) QT += testlib \ script \ declarative -DESTDIR = $$DESIGNER_BINARY_DIRECTORY -include(../../../../../src/plugins/qmldesigner/designercore/designercore.pri) -include(../../../../../src/libs/qmljs/qmljs-lib.pri) -HEADERS+=../../../../../src/libs/utils/changeset.h -SOURCES+=../../../../../src/libs/utils/changeset.cpp -INCLUDEPATH+=../../../../../src/libs -DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB +# DESTDIR = $$DESIGNER_BINARY_DIRECTORY +include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri) +include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri) +HEADERS+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.h +SOURCES+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.cpp +INCLUDEPATH+=$$IDE_SOURCE_TREE/src/libs +#DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB -DEPENDPATH += ../../../../../src/plugins/qmldesigner/core/include DEPENDPATH += .. +DEPENDPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore TARGET = tst_propertyeditor + CONFIG += console CONFIG -= app_bundle TEMPLATE = app diff --git a/tests/auto/qml/qmldesigner/qmldesigner.pro b/tests/auto/qml/qmldesigner/qmldesigner.pro index eaeb28fdaefa490753dcd947fe9652f78a63d19b..ea6c3d58a0e90b0e8328be1e9d9bed4755ebf4bb 100644 --- a/tests/auto/qml/qmldesigner/qmldesigner.pro +++ b/tests/auto/qml/qmldesigner/qmldesigner.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs SUBDIRS += coretests -SUBDIRS += propertyeditortests +# SUBDIRS += propertyeditortests SUBDIRS += bauhaustests diff --git a/tests/auto/qml/qmldesigner/testview.cpp b/tests/auto/qml/qmldesigner/testview.cpp index 33a64158797813b900c6d4b4349068fce846a97e..38d6329a1f6d876fc51c117bafeab45f3cb1f1e9 100644 --- a/tests/auto/qml/qmldesigner/testview.cpp +++ b/tests/auto/qml/qmldesigner/testview.cpp @@ -30,11 +30,6 @@ #include "testview.h" #include <QtDebug> -#include <modelnode.h> -#include <model.h> -#include <modelnode.h> -#include <nodeabstractproperty.h> -#include <nodelistproperty.h> #include <qtestcase.h> TestView::TestView(QObject *parent) diff --git a/tests/auto/qml/qmldesigner/testview.h b/tests/auto/qml/qmldesigner/testview.h index 6089a30d7e4288472d7e8bf491f3400fa8030455..6a7b6793daa6ccc3502d92744b3587993554816b 100644 --- a/tests/auto/qml/qmldesigner/testview.h +++ b/tests/auto/qml/qmldesigner/testview.h @@ -30,7 +30,6 @@ #ifndef TESTVIEW_H #define TESTVIEW_H -#include <modelnode.h> #include <qmlmodelview.h> #include <QVariant> #include <QStringList>