From 374098ba55cf11d7cf7496558ca08e1b0b4156cb Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 12 Apr 2012 12:42:47 +0200
Subject: [PATCH] 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 <joerg.bornemann@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
src/assistant/clucene/clucene.pro | 9 +--------
src/assistant/help/help.pro | 8 +-------
src/designer/src/components/lib/lib.pro | 7 ++-----
src/designer/src/designer/designer.pro | 4 +---
src/designer/src/lib/lib.pro | 9 +--------
src/designer/src/uitools/uitools.pro | 8 ++------
src/linguist/linguist/linguist.pro | 2 +-
src/linguist/lrelease/lrelease.pro | 2 +-
src/linguist/lupdate/lupdate.pro | 2 +-
src/linguist/tests/data/test.pro | 5 -----
src/makeqpf/makeqpf.pro | 3 +--
src/qtconfig/qtconfig.pro | 3 +--
.../wince/cetcpsyncserver/cetcpsyncserver.pro | 1 -
src/qttracereplay/qttracereplay.pro | 7 ++-----
sync.profile | 17 -----------------
15 files changed, 15 insertions(+), 72 deletions(-)
diff --git a/src/assistant/clucene/clucene.pro b/src/assistant/clucene/clucene.pro
index 47be4613c..e2877d8ab 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 75768c540..89fe7cf49 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 e1f9381f8..af2d795d0 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 36ecea4ab..0e88b4460 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 5c44b43d4..03e25f73b 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 75328d7c2..830f57bb1 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 21e39c41c..337e77d41 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 b144f55df..83ee3125e 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 d9905db73..61f260a50 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 90e5704b4..412390fbb 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 244a2d943..bd976db95 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 1663f3e89..7b904c0c8 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 bd01d2dab..f03ebd10f 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 79672b669..7570f1afc 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 392fdb1bf..8c8674f6c 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 <QtSql/QtSql>\n",
- "xml" => "#include <QtXml/QtXml>\n",
- "network" => "#include <QtNetwork/QtNetwork>\n",
- "script" => "#include <QtScript/QtScript>\n",
- "declarative" => "#include <QtDeclarative/QtDeclarative>\n",
- "clucene" => "#include <QtCLucene/QtCLucene>\n",
- "help" => "#include <QtHelp/QtHelp>\n",
- "designer" => "#include <QtDesigner/QtDesigner>\n",
- "designercomponents" => "#include <QtDesignerComponents/QtDesignerComponents>\n",
- "uitools" => "#include <QtUiTools/QtUiTools>\n",
);
# Module dependencies.
# Every module that is required to build this module should have one entry.
--
GitLab