From: Oswald Buddenhagen Date: Thu, 12 Apr 2012 10:42:47 +0000 (+0200) Subject: build system cleanups X-Git-Tag: accepted/tizen/20131212.181521~291^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=374098ba55cf11d7cf7496558ca08e1b0b4156cb;p=platform%2Fupstream%2Fqttools.git build system cleanups - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - pointless QPRO_PWD assignments - qmake -project boilerplate Change-Id: I64ce8134c471ccf674b6815878b4090a7eb8d961 Reviewed-by: Joerg Bornemann Reviewed-by: Friedemann Kleint --- diff --git a/src/assistant/clucene/clucene.pro b/src/assistant/clucene/clucene.pro index 47be461..e2877d8 100644 --- a/src/assistant/clucene/clucene.pro +++ b/src/assistant/clucene/clucene.pro @@ -1,18 +1,13 @@ MODULE = clucene -load(qt_module) +load(qt_build_config) TARGET = QtCLucene -QPRO_PWD = $$PWD - -CONFIG += module - QT = core DEFINES += QHELP_LIB load(qt_module_config) -HEADERS += qtcluceneversion.h include(fulltextsearch.pri) @@ -23,8 +18,6 @@ contains(QT_CONFIG, reduce_exports) { linux*-g++*:DEFINES += _GLIBCXX_EXTERN_TEMPLATE=0 } -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore - # impossible to disable exceptions in clucene atm CONFIG(exceptions_off) { CONFIG -= exceptions_off diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro index 75768c5..89fe7cf 100644 --- a/src/assistant/help/help.pro +++ b/src/assistant/help/help.pro @@ -1,9 +1,6 @@ -load(qt_module) +load(qt_build_config) TARGET = QtHelp -QPRO_PWD = $$PWD - -CONFIG += module QT = core-private gui widgets DEFINES += QHELP_LIB QT_CLUCENE_SUPPORT @@ -13,8 +10,6 @@ load(qt_module_config) # private dependencies QT += network sql clucene-private -HEADERS += qthelpversion.h - DEFINES -= QT_ASCII_CAST_WARNINGS mac:CONFIG(qt_framework, qt_framework|qt_no_framework) { @@ -27,7 +22,6 @@ else { win32:qclucene = $${qclucene}d } linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene - unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtCore QtNetwork QtSql qclucene = -l$$qclucene LIBS_PRIVATE += -L$$QT.clucene.libs } diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro index e1f9381..af2d795 100644 --- a/src/designer/src/components/lib/lib.pro +++ b/src/designer/src/components/lib/lib.pro @@ -1,12 +1,9 @@ -load(qt_module) +load(qt_build_config) +MODULE = designercomponents TARGET = QtDesignerComponents - - -CONFIG += module QT = core gui-private widgets-private designer-private -MODULE = designercomponents load(qt_module_config) # private dependencies diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro index 36ecea4..0e88b44 100644 --- a/src/designer/src/designer/designer.pro +++ b/src/designer/src/designer/designer.pro @@ -1,11 +1,9 @@ -load(qt_module) +load(qt_build_config) DESTDIR = $$QT.designer.bins QT += core-private widgets xml network designer-private !isEmpty(QT.printsupport.name): QT += printsupport -CONFIG += module - build_all:!build_pass { CONFIG -= build_all CONFIG += release diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro index 5c44b43..03e25f7 100644 --- a/src/designer/src/lib/lib.pro +++ b/src/designer/src/lib/lib.pro @@ -1,20 +1,13 @@ MODULE = designer -load(qt_module) +load(qt_build_config) TARGET = QtDesigner -QPRO_PWD = $$PWD - -CONFIG += module QT = core-private gui-private widgets-private xml -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml QtCore QtGui QtWidgets - MODULE_CONFIG = designer_defines load(qt_module_config) -HEADERS += qtdesignerversion.h - DEFINES += \ QDESIGNER_SDK_LIBRARY \ QDESIGNER_EXTENSION_LIBRARY \ diff --git a/src/designer/src/uitools/uitools.pro b/src/designer/src/uitools/uitools.pro index 75328d7..830f57b 100644 --- a/src/designer/src/uitools/uitools.pro +++ b/src/designer/src/uitools/uitools.pro @@ -1,13 +1,9 @@ -load(qt_module) +load(qt_build_config) TARGET = QtUiTools -QPRO_PWD = $$PWD - -CONFIG += qt staticlib module +CONFIG += staticlib QT = core -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtCore - load(qt_module_config) HEADERS += quiloader.h diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro index 21e39c4..337e77d 100644 --- a/src/linguist/linguist/linguist.pro +++ b/src/linguist/linguist/linguist.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TEMPLATE = app LANGUAGE = C++ diff --git a/src/linguist/lrelease/lrelease.pro b/src/linguist/lrelease/lrelease.pro index b144f55..83ee312 100644 --- a/src/linguist/lrelease/lrelease.pro +++ b/src/linguist/lrelease/lrelease.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TEMPLATE = app TARGET = lrelease diff --git a/src/linguist/lupdate/lupdate.pro b/src/linguist/lupdate/lupdate.pro index d9905db..61f260a 100644 --- a/src/linguist/lupdate/lupdate.pro +++ b/src/linguist/lupdate/lupdate.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TEMPLATE = app TARGET = lupdate diff --git a/src/linguist/tests/data/test.pro b/src/linguist/tests/data/test.pro index 90e5704..412390f 100644 --- a/src/linguist/tests/data/test.pro +++ b/src/linguist/tests/data/test.pro @@ -1,8 +1,3 @@ -TEMPLATE = app -TARGET += -DEPENDPATH += . -INCLUDEPATH += . - SOURCES += main.cpp TRANSLATIONS += t1_en.ts diff --git a/src/makeqpf/makeqpf.pro b/src/makeqpf/makeqpf.pro index 244a2d9..bd976db 100644 --- a/src/makeqpf/makeqpf.pro +++ b/src/makeqpf/makeqpf.pro @@ -1,5 +1,4 @@ -DEPENDPATH += . -INCLUDEPATH += . ../../src/3rdparty/harfbuzz/src +INCLUDEPATH += ../../src/3rdparty/harfbuzz/src QT += widgets gui-private core-private CONFIG += console DESTDIR = $$QT.designer.bins diff --git a/src/qtconfig/qtconfig.pro b/src/qtconfig/qtconfig.pro index 1663f3e..7b904c0 100644 --- a/src/qtconfig/qtconfig.pro +++ b/src/qtconfig/qtconfig.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TEMPLATE = app CONFIG += qt warn_on x11 @@ -27,5 +27,4 @@ DESTDIR = $$QT.designer.bins target.path=$$[QT_INSTALL_BINS] INSTALLS += target -INCLUDEPATH += . DBFILE = qtconfig.db diff --git a/src/qtestlib/wince/cetcpsyncserver/cetcpsyncserver.pro b/src/qtestlib/wince/cetcpsyncserver/cetcpsyncserver.pro index bd01d2d..f03ebd1 100644 --- a/src/qtestlib/wince/cetcpsyncserver/cetcpsyncserver.pro +++ b/src/qtestlib/wince/cetcpsyncserver/cetcpsyncserver.pro @@ -1,6 +1,5 @@ TEMPLATE = app TARGET = cetcpsyncsvr -DEPENDPATH += . QT -= gui QT += network diff --git a/src/qttracereplay/qttracereplay.pro b/src/qttracereplay/qttracereplay.pro index 79672b6..7570f1a 100644 --- a/src/qttracereplay/qttracereplay.pro +++ b/src/qttracereplay/qttracereplay.pro @@ -1,11 +1,8 @@ -load(qt_module) - -TEMPLATE = app +load(qt_build_config) DESTDIR = $$QT.designer.bins -DEPENDPATH += . -INCLUDEPATH += . $$QT.gui.sources/../3rdparty/harfbuzz/src +INCLUDEPATH += $$QT.gui.sources/../3rdparty/harfbuzz/src TARGET = qttracereplay QT += core-private gui-private widgets widgets-private CONFIG += console diff --git a/sync.profile b/sync.profile index 392fdb1..8c8674f 100644 --- a/sync.profile +++ b/sync.profile @@ -8,23 +8,6 @@ %moduleheaders = ( # restrict the module headers to those found in relative path ); %classnames = ( - "qtcluceneversion.h" => "QtCLuceneVersion", - "qthelpversion.h" => "QtHelpVersion", - "qtuitoolsversion.h" => "QtUiToolsVersion", - "qtdesignerversion.h" => "QtDesigner", - "qtdesignercomponentsversion.h" => "QtDesignerComponents", -); -%mastercontent = ( - "sql" => "#include \n", - "xml" => "#include \n", - "network" => "#include \n", - "script" => "#include \n", - "declarative" => "#include \n", - "clucene" => "#include \n", - "help" => "#include \n", - "designer" => "#include \n", - "designercomponents" => "#include \n", - "uitools" => "#include \n", ); # Module dependencies. # Every module that is required to build this module should have one entry.