diff --git a/src/plugins/qtsupport/qtsupport.pri b/src/plugins/qtsupport/qtsupport.pri index e4de26c4ca8558406aa54a19ab16dcbbcb08e09c..6ab5e712ab2a9d6a91c926c15e7fa17ab3323032 100644 --- a/src/plugins/qtsupport/qtsupport.pri +++ b/src/plugins/qtsupport/qtsupport.pri @@ -1,8 +1,3 @@ include(qtsupport_dependencies.pri) LIBS *= -l$$qtLibraryName(QtSupport) -DEFINES *= QMAKE_AS_LIBRARY -DEFINES *= PROPARSER_THREAD_SAFE -DEFINES *= PROEVALUATOR_THREAD_SAFE -DEFINES *= PROEVALUATOR_CUMULATIVE -DEFINES *= PROEVALUATOR_SETENV diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro index ba394accc8c6b69ed0d601b27b421b30908eb526..4ca5ea206a25ee5576abdc786d73e49fcc15725f 100644 --- a/src/plugins/qtsupport/qtsupport.pro +++ b/src/plugins/qtsupport/qtsupport.pro @@ -4,9 +4,8 @@ DEFINES += QT_CREATOR QTSUPPORT_LIBRARY QT += network declarative include(../../qtcreatorplugin.pri) -DEFINES += \ - QMAKE_AS_LIBRARY QMAKE_LIBRARY \ - PROPARSER_THREAD_SAFE PROEVALUATOR_THREAD_SAFE PROEVALUATOR_CUMULATIVE PROEVALUATOR_SETENV + +DEFINES += QMAKE_LIBRARY include(../../shared/proparser/proparser.pri) HEADERS += \ diff --git a/src/plugins/qtsupport/qtsupport_dependencies.pri b/src/plugins/qtsupport/qtsupport_dependencies.pri index e80b878076e9e65dba535fe23484aad4417f1aff..d366fe5ecec113accaa4dacf2d8297b9145fe303 100644 --- a/src/plugins/qtsupport/qtsupport_dependencies.pri +++ b/src/plugins/qtsupport/qtsupport_dependencies.pri @@ -1,3 +1,9 @@ include(../../plugins/projectexplorer/projectexplorer.pri) include(../../libs/qmljs/qmljs.pri) include(../../libs/utils/utils.pri) +DEFINES *= \ + QMAKE_AS_LIBRARY \ + PROPARSER_THREAD_SAFE \ + PROEVALUATOR_THREAD_SAFE \ + PROEVALUATOR_CUMULATIVE \ + PROEVALUATOR_SETENV