From 60a578ec8063195f6633549c491bdc28b1bceb7c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Apr 2012 11:25:06 +0200 Subject: [PATCH] auto-generate module pris Change-Id: I1ba2a287525556fcdc1c0db5a1ef3ade16c12eda Reviewed-by: Friedemann Kleint Reviewed-by: Joerg Bornemann --- modules/qt_clucene.pri | 17 ----------------- modules/qt_designer.pri | 17 ----------------- modules/qt_designercomponents.pri | 16 ---------------- modules/qt_help.pri | 17 ----------------- modules/qt_uitools.pri | 18 ------------------ src/assistant/assistant/assistant.pro | 2 +- src/assistant/clucene/clucene.pro | 1 - src/assistant/help/help.pro | 8 ++++---- src/designer/src/components/lib/lib.pro | 10 +++++----- src/designer/src/designer/designer.pro | 1 - src/designer/src/lib/lib.pro | 4 ++-- src/designer/src/lib/uilib/uilib.pri | 2 +- src/designer/src/uitools/uitools.pro | 4 +--- sync.profile | 7 ------- 14 files changed, 14 insertions(+), 110 deletions(-) delete mode 100644 modules/qt_clucene.pri delete mode 100644 modules/qt_designer.pri delete mode 100644 modules/qt_designercomponents.pri delete mode 100644 modules/qt_help.pri delete mode 100644 modules/qt_uitools.pri diff --git a/modules/qt_clucene.pri b/modules/qt_clucene.pri deleted file mode 100644 index e8d56b5..0000000 --- a/modules/qt_clucene.pri +++ /dev/null @@ -1,17 +0,0 @@ -QT.clucene.VERSION = 5.0.0 -QT.clucene.MAJOR_VERSION = 5 -QT.clucene.MINOR_VERSION = 0 -QT.clucene.PATCH_VERSION = 0 - -QT.clucene.name = QtCLucene -QT.clucene.bins = $$QT_MODULE_BIN_BASE -QT.clucene.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtCLucene -QT.clucene.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCLucene/$$QT.clucene.VERSION -QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/clucene -QT.clucene.libs = $$QT_MODULE_LIB_BASE -QT.clucene.plugins = $$QT_MODULE_PLUGIN_BASE -QT.clucene.imports = $$QT_MODULE_IMPORT_BASE -QT.clucene.depends = core -QT.clucene.defines = QT_CLUCLENE_LIB - -QT_CONFIG += clucene diff --git a/modules/qt_designer.pri b/modules/qt_designer.pri deleted file mode 100644 index faf2204..0000000 --- a/modules/qt_designer.pri +++ /dev/null @@ -1,17 +0,0 @@ -QT.designer.VERSION = 5.0.0 -QT.designer.MAJOR_VERSION = 5 -QT.designer.MINOR_VERSION = 0 -QT.designer.PATCH_VERSION = 0 - -QT.designer.name = QtDesigner -QT.designer.bins = $$QT_MODULE_BIN_BASE -QT.designer.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDesigner -QT.designer.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/$$QT.designer.VERSION -QT.designer.sources = $$QT_MODULE_BASE/src/designer/src/lib -QT.designer.libs = $$QT_MODULE_LIB_BASE -QT.designer.plugins = $$QT_MODULE_PLUGIN_BASE -QT.designer.imports = $$QT_MODULE_IMPORT_BASE -QT.designer.depends = core xml gui widgets -QT.designer.DEFINES = QT_DESIGNER_LIB - -QT_CONFIG += designer diff --git a/modules/qt_designercomponents.pri b/modules/qt_designercomponents.pri deleted file mode 100644 index a453c79..0000000 --- a/modules/qt_designercomponents.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.designercomponents.VERSION = 5.0.0 -QT.designercomponents.MAJOR_VERSION = 5 -QT.designercomponents.MINOR_VERSION = 0 -QT.designercomponents.PATCH_VERSION = 0 - -QT.designercomponents.name = QtDesignerComponents -QT.designercomponents.bins = $$QT_MODULE_BIN_BASE -QT.designercomponents.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDesignerComponents -QT.designercomponents.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesignerComponents/$$QT.designercomponents.VERSION -QT.designercomponents.sources = $$QT_MODULE_BASE/src/designer/src/components/lib -QT.designercomponents.libs = $$QT_MODULE_LIB_BASE -QT.designercomponents.plugins = $$QT_MODULE_PLUGIN_BASE -QT.designercomponents.imports = $$QT_MODULE_IMPORT_BASE -QT.designercomponents.depends = core xml gui widgets - -QT_CONFIG += designercomponents diff --git a/modules/qt_help.pri b/modules/qt_help.pri deleted file mode 100644 index a61086c..0000000 --- a/modules/qt_help.pri +++ /dev/null @@ -1,17 +0,0 @@ -QT.help.VERSION = 5.0.0 -QT.help.MAJOR_VERSION = 5 -QT.help.MINOR_VERSION = 0 -QT.help.PATCH_VERSION = 0 - -QT.help.name = QtHelp -QT.help.bins = $$QT_MODULE_BIN_BASE -QT.help.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtHelp -QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/$$QT.help.VERSION -QT.help.sources = $$QT_MODULE_BASE/src/assistant/help -QT.help.libs = $$QT_MODULE_LIB_BASE -QT.help.plugins = $$QT_MODULE_PLUGIN_BASE -QT.help.imports = $$QT_MODULE_IMPORT_BASE -QT.help.depends = network sql -QT.help.DEFINES = QT_HELP_LIB - -QT_CONFIG += help diff --git a/modules/qt_uitools.pri b/modules/qt_uitools.pri deleted file mode 100644 index 9e645b2..0000000 --- a/modules/qt_uitools.pri +++ /dev/null @@ -1,18 +0,0 @@ -QT.uitools.VERSION = 5.0.0 -QT.uitools.MAJOR_VERSION = 5 -QT.uitools.MINOR_VERSION = 0 -QT.uitools.PATCH_VERSION = 0 - -QT.uitools.name = QtUiTools -QT.uitools.bins = $$QT_MODULE_BIN_BASE -QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtUiTools -QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/$$QT.uitools.VERSION -QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools -QT.uitools.libs = $$QT_MODULE_LIB_BASE -QT.uitools.plugins = $$QT_MODULE_PLUGIN_BASE -QT.uitools.imports = $$QT_MODULE_IMPORT_BASE -QT.uitools.depends = xml -QT.uitools.module_config = staticlib -QT.uitools.DEFINES = QT_UITOOLS_LIB - -QT_CONFIG += uitools diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro index 3264f2d..4c4008e 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -10,7 +10,7 @@ DESTDIR = $$QT.help.bins CONFIG += qt \ warn_on \ help -QT += widgets network help +QT += widgets network help sql !isEmpty(QT.printsupport.name): QT += printsupport PROJECTNAME = Assistant diff --git a/src/assistant/clucene/clucene.pro b/src/assistant/clucene/clucene.pro index bf90e9b..47be461 100644 --- a/src/assistant/clucene/clucene.pro +++ b/src/assistant/clucene/clucene.pro @@ -6,7 +6,6 @@ TARGET = QtCLucene QPRO_PWD = $$PWD CONFIG += module -MODULE_PRI = ../../../modules/qt_clucene.pri QT = core diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro index 76b4b94..75768c5 100644 --- a/src/assistant/help/help.pro +++ b/src/assistant/help/help.pro @@ -1,18 +1,18 @@ -MODULE = help - load(qt_module) TARGET = QtHelp QPRO_PWD = $$PWD -QT += widgets sql network core-private clucene clucene-private CONFIG += module -MODULE_PRI += ../../../modules/qt_help.pri +QT = core-private gui widgets DEFINES += QHELP_LIB QT_CLUCENE_SUPPORT load(qt_module_config) +# private dependencies +QT += network sql clucene-private + HEADERS += qthelpversion.h DEFINES -= QT_ASCII_CAST_WARNINGS diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro index 0c316d4..e1f9381 100644 --- a/src/designer/src/components/lib/lib.pro +++ b/src/designer/src/components/lib/lib.pro @@ -1,16 +1,17 @@ -MODULE = designercomponents load(qt_module) -TEMPLATE = lib TARGET = QtDesignerComponents -QT += gui-private widgets widgets-private designer designer-private CONFIG += module -MODULE_PRI = ../../../../../modules/qt_designercomponents.pri +QT = core gui-private widgets-private designer-private +MODULE = designercomponents load(qt_module_config) +# private dependencies +QT += xml + # QtDesignerComponents uses DEFINES += QT_STATICPLUGIN DEFINES += QDESIGNER_COMPONENTS_LIBRARY @@ -20,7 +21,6 @@ QMAKE_TARGET_PRODUCT = Designer QMAKE_TARGET_DESCRIPTION = Graphical user interface designer. #load up the headers info -CONFIG += qt_install_headers HEADERS_PRI = $$QT.designer.includes/headers.pri include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI) diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro index a9efc94..36ecea4 100644 --- a/src/designer/src/designer/designer.pro +++ b/src/designer/src/designer/designer.pro @@ -5,7 +5,6 @@ QT += core-private widgets xml network designer-private !isEmpty(QT.printsupport.name): QT += printsupport CONFIG += module -MODULE_PRI = ../../../../modules/qt_designer.pri build_all:!build_pass { CONFIG -= build_all diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro index 5006420..5c44b43 100644 --- a/src/designer/src/lib/lib.pro +++ b/src/designer/src/lib/lib.pro @@ -4,13 +4,13 @@ load(qt_module) TARGET = QtDesigner QPRO_PWD = $$PWD -QT += core-private gui-private widgets widgets-private xml CONFIG += module -MODULE_PRI = ../../../../modules/qt_designer.pri +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 diff --git a/src/designer/src/lib/uilib/uilib.pri b/src/designer/src/lib/uilib/uilib.pri index a84d4a5..1322aee 100644 --- a/src/designer/src/lib/uilib/uilib.pri +++ b/src/designer/src/lib/uilib/uilib.pri @@ -3,7 +3,7 @@ INCLUDEPATH += $$PWD DEFINES += QT_DESIGNER -QT += gui widgets +QT += widgets # Input HEADERS += \ diff --git a/src/designer/src/uitools/uitools.pro b/src/designer/src/uitools/uitools.pro index 28223d4..75328d7 100644 --- a/src/designer/src/uitools/uitools.pro +++ b/src/designer/src/uitools/uitools.pro @@ -1,12 +1,10 @@ -MODULE = uitools - load(qt_module) TARGET = QtUiTools QPRO_PWD = $$PWD CONFIG += qt staticlib module -MODULE_PRI = ../../../../modules/qt_uitools.pri +QT = core unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtCore diff --git a/sync.profile b/sync.profile index 43f732e..392fdb1 100644 --- a/sync.profile +++ b/sync.profile @@ -26,13 +26,6 @@ "designercomponents" => "#include \n", "uitools" => "#include \n", ); -%modulepris = ( - "QtCLucene" => "$basedir/modules/qt_clucene.pri", - "QtHelp" => "$basedir/modules/qt_help.pri", - "QtUiTools" => "$basedir/modules/qt_uitools.pri", - "QtDesigner" => "$basedir/modules/qt_designer.pri", - "QtDesignerComponents" => "$basedir/modules/qt_designercomponents.pri", -); # Module dependencies. # Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: -- 2.7.4