From 8fcdd3441d3746f274c33c70c9b313de76536d9c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Date: Mon, 25 Mar 2013 20:51:49 +0100 Subject: [PATCH] move qtsupport defines to qtsupport_dependencies.pri they are used in both the plugin itself and in the plugin's .pri Change-Id: I6547178e597b370c0a8aa29f69072c8119d1382a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> --- src/plugins/qtsupport/qtsupport.pri | 5 ----- src/plugins/qtsupport/qtsupport.pro | 5 ++--- src/plugins/qtsupport/qtsupport_dependencies.pri | 6 ++++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/qtsupport/qtsupport.pri b/src/plugins/qtsupport/qtsupport.pri index e4de26c4ca8..6ab5e712ab2 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 ba394accc8c..4ca5ea206a2 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 e80b878076e..d366fe5ecec 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 -- GitLab