From baff9bd78b66ac19c8d6acb32422490ac59a8832 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Date: Wed, 1 Jun 2011 17:31:02 +0200 Subject: [PATCH] fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add missing define. stupid qmake ... Change-Id: I3cec37b87caa6f2c0432bc75c712d5663fb191e6 Reviewed-on: http://codereview.qt.nokia.com/316 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> --- src/plugins/qtsupport/qtsupport.pri | 4 +++- src/plugins/qtsupport/qtsupport.pro | 4 +++- src/shared/proparser/proparser.pri | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/qtsupport/qtsupport.pri b/src/plugins/qtsupport/qtsupport.pri index 834156ccd64..f3f796a6fc2 100644 --- a/src/plugins/qtsupport/qtsupport.pri +++ b/src/plugins/qtsupport/qtsupport.pri @@ -1,4 +1,6 @@ include(qtsupport_dependencies.pri) LIBS *= -l$$qtLibraryName(QtSupport) -DEFINES += PROPARSER_AS_LIBRARY PROPARSER_THREAD_SAFE PROEVALUATOR_THREAD_SAFE +DEFINES += \ + PROPARSER_AS_LIBRARY \ + PROPARSER_THREAD_SAFE PROEVALUATOR_THREAD_SAFE PROEVALUATOR_CUMULATIVE diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro index a2f425465ea..eff34bdb7ec 100644 --- a/src/plugins/qtsupport/qtsupport.pro +++ b/src/plugins/qtsupport/qtsupport.pro @@ -4,7 +4,9 @@ DEFINES += QT_CREATOR QTSUPPORT_LIBRARY QT += network include(../../qtcreatorplugin.pri) include(qtsupport_dependencies.pri) -DEFINES += PROPARSER_AS_LIBRARY PROPARSER_LIBRARY PROPARSER_THREAD_SAFE PROEVALUATOR_THREAD_SAFE +DEFINES += \ + PROPARSER_AS_LIBRARY PROPARSER_LIBRARY \ + PROPARSER_THREAD_SAFE PROEVALUATOR_THREAD_SAFE PROEVALUATOR_CUMULATIVE include(../../shared/proparser/proparser.pri) HEADERS += \ diff --git a/src/shared/proparser/proparser.pri b/src/shared/proparser/proparser.pri index 4bc5b878d25..f7132c5eb80 100644 --- a/src/shared/proparser/proparser.pri +++ b/src/shared/proparser/proparser.pri @@ -1,6 +1,5 @@ VPATH += $$PWD QT += xml -DEFINES += PROEVALUATOR_CUMULATIVE INCLUDEPATH *= $$PWD $$PWD/.. DEPENDPATH *= $$PWD $$PWD/.. -- GitLab