From 0b76b7ab8a37aa49a8aa7261f3e079bd8674ee47 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 4 Jun 2012 17:12:24 +0200 Subject: auto-generate module pris Change-Id: I654428771034221ccf424be34d5d9c7764daf3b4 Reviewed-by: Joerg Bornemann --- bin/syncqt | 36 ++++++++++----------- mkspecs/features/qt_module_config.prf | 57 ++++++++++++++++++++++++++++++++- mkspecs/features/testlib_defines.prf | 1 + src/concurrent/concurrent.pro | 2 -- src/corelib/corelib.pro | 2 +- src/dbus/dbus.pro | 3 +- src/gui/gui.pro | 3 +- src/modules/qt_concurrent.pri | 15 --------- src/modules/qt_core.pri | 16 --------- src/modules/qt_dbus.pri | 16 --------- src/modules/qt_gui.pri | 15 --------- src/modules/qt_network.pri | 15 --------- src/modules/qt_opengl.pri | 16 --------- src/modules/qt_platformsupport.pri | 16 --------- src/modules/qt_printsupport.pri | 14 -------- src/modules/qt_sql.pri | 15 --------- src/modules/qt_testlib.pri | 16 --------- src/modules/qt_widgets.pri | 16 --------- src/modules/qt_xml.pri | 15 --------- src/network/network.pro | 2 -- src/opengl/opengl.pro | 2 -- src/platformsupport/platformsupport.pro | 6 +--- src/printsupport/printsupport.pro | 2 -- src/sql/sql.pro | 2 -- src/testlib/testlib.pro | 2 +- src/widgets/widgets.pro | 6 ++-- src/xml/xml.pro | 2 -- sync.profile | 14 -------- 28 files changed, 82 insertions(+), 245 deletions(-) create mode 100644 mkspecs/features/testlib_defines.prf delete mode 100644 src/modules/qt_concurrent.pri delete mode 100644 src/modules/qt_core.pri delete mode 100644 src/modules/qt_dbus.pri delete mode 100644 src/modules/qt_gui.pri delete mode 100644 src/modules/qt_network.pri delete mode 100644 src/modules/qt_opengl.pri delete mode 100644 src/modules/qt_platformsupport.pri delete mode 100644 src/modules/qt_printsupport.pri delete mode 100644 src/modules/qt_sql.pri delete mode 100644 src/modules/qt_testlib.pri delete mode 100644 src/modules/qt_widgets.pri delete mode 100644 src/modules/qt_xml.pri diff --git a/bin/syncqt b/bin/syncqt index e72a4f1a58..30a870f195 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -811,12 +811,24 @@ my %allmoduleheadersprivate = map { $_ => 1 } @allmoduleheadersprivate; $isunix = checkUnix; #cache checkUnix +my $qt_version = fileContents($qtbasedir."/mkspecs/qconfig.pri"); +if (length($qt_version)) { + $qt_version =~ s,.*^QT_VERSION\h*=\h*(\S+).*,$1,sm; +} else { + $qt_version = fileContents($basedir."/src/corelib/global/qglobal.h"); + $qt_version =~ s,.*^#\h*define\h+QT_VERSION_STR\h+"([^"]+)".*,$1,sm; +} foreach my $lib (@modules_to_sync) { #iteration info my $dir = $modules{$lib}; - my $module_version = ""; - if (-e "$modulepris{$lib}") { + my $project = $dir; + $project =~ s,/([^/]+)$,/$1/$1.pro,; + my $module_version = fileContents($project); + $module_version = $qt_version unless ($module_version =~ s,.*^VERSION\h*=\h*(\S+).*,$1,sm); + + # Backwards compatibility for modules with checked in .pri files. + if (defined $modulepris{$lib} and -e "$modulepris{$lib}") { my $content = fileContents($modulepris{$lib}); my @version_rows = grep(/QT\..*\.VERSION/, split('\n', $content)); if(@version_rows) { @@ -827,7 +839,6 @@ foreach my $lib (@modules_to_sync) { $module_version =~ s/\s+$//; } } - print "$lib: WARNING: Module\'s pri missing QT..VERSION variable! Private headers not versioned!\n" if (!$module_version); my $pathtoheaders = ""; $pathtoheaders = $moduleheaders{$lib} if ($moduleheaders{$lib}); @@ -856,6 +867,7 @@ foreach my $lib (@modules_to_sync) { my $content = $mastercontent{$_}; $master_contents .= $content if ($content); } + last; #consecutive appearances are assumed to be private dependencies } } close(F); @@ -1011,17 +1023,9 @@ foreach my $lib (@modules_to_sync) { } } elsif ($create_private_headers && !$qpa_header) { - if ($module_version) { - @headers = ( "$out_basedir/include/$lib/$module_version/$lib/private/$header" ); - } else { - @headers = ( "$out_basedir/include/$lib/private/$header" ); - } + @headers = ( "$out_basedir/include/$lib/$module_version/$lib/private/$header" ); } elsif ($create_private_headers) { - if ($module_version) { - @headers = ( "$out_basedir/include/$lib/$module_version/$lib/qpa/$header" ); - } else { - @headers = ( "$out_basedir/include/$lib/qpa/$header" ); - } + @headers = ( "$out_basedir/include/$lib/$module_version/$lib/qpa/$header" ); } foreach(@headers) { #sync them @@ -1102,11 +1106,7 @@ foreach my $lib (@modules_to_sync) { my $header_path = "$out_basedir/include/$lib/"; unless ($public_header) { - if ($module_version) { - $header_path .= "$module_version/$lib/private/"; - } else { - $header_path .= "private/"; - } + $header_path .= "$module_version/$lib/private/"; } $header_path .= "$header"; diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 220805081a..90952be57b 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -12,6 +12,10 @@ isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0) isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}") isEmpty(VERSION):VERSION = $$QT_VERSION +ucmodule = $$upper($$MODULE) + +MODULE_DEPENDS = $$replace(QT, -private$, ) + # Find the module's source root dir. MODULE_PROFILE_DIR = $$_PRO_FILE_PWD_ for(ever) { @@ -26,13 +30,64 @@ isEmpty(MODULE_BASE_DIR): MODULE_BASE_DIR = $$MODULE_PROFILE_DIR MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_DIR) isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR +# This check will be removed soon. Weird indentation to avoid reindenting the code later. +!isEmpty(MODULE_PRI) { + !build_pass:warning("$$_PRO_FILE_ still sets MODULE_PRI. Not auto-generating module .pri file.") + MODULE_PRI = $$absolute_path($$MODULE_PRI, $$_PRO_FILE_PWD_) + exists($$MODULE_PRI)|error("Specified module pri file $$MODULE_PRI does not exist.") +} else { + +MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_$${MODULE}.pri + +!build_pass { + + # Create a module .pri file + staticlib: \ + module_build_type = "QT.$${MODULE}.module_config = staticlib" + else: \ + module_build_type = + !isEmpty(MODULE_CONFIG): \ + module_config = "QT.$${MODULE}.CONFIG = $$MODULE_CONFIG" + else: \ + module_config = + contains(TARGET, QtAddOn.*): \ + MODULE_DEFINE = QT_ADDON_$${ucmodule}_LIB + else: \ + MODULE_DEFINE = QT_$${ucmodule}_LIB + MODULE_DEFINES = $$MODULE_DEFINE $$MODULE_DEFINES + MODULE_PRI_CONT = \ + "QT.$${MODULE}.VERSION = $${VERSION}" \ + "QT.$${MODULE}.MAJOR_VERSION = $$section(VERSION, ., 0, 0)" \ + "QT.$${MODULE}.MINOR_VERSION = $$section(VERSION, ., 1, 1)" \ + "QT.$${MODULE}.PATCH_VERSION = $$section(VERSION, ., 2, 2)" \ + "" \ + "QT.$${MODULE}.name = $$TARGET" \ + "QT.$${MODULE}.bins = \$\$QT_MODULE_BIN_BASE" \ + "QT.$${MODULE}.includes = \$\$QT_MODULE_INCLUDE_BASE \$\$QT_MODULE_INCLUDE_BASE/$$TARGET" \ + "QT.$${MODULE}.private_includes = \$\$QT_MODULE_INCLUDE_BASE/$$TARGET/\$\$QT.$${MODULE}.VERSION" \ + "QT.$${MODULE}.sources = $$val_escape(_PRO_FILE_PWD_)" \ + "QT.$${MODULE}.libs = \$\$QT_MODULE_LIB_BASE" \ + "QT.$${MODULE}.plugins = \$\$QT_MODULE_PLUGIN_BASE" \ + "QT.$${MODULE}.imports = \$\$QT_MODULE_IMPORT_BASE" \ + "QT.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \ + $$module_build_type \ + $$module_config \ + "QT.$${MODULE}.DEFINES = $$MODULE_DEFINES" \ # assume sufficient quoting + "" \ + "QT_CONFIG += $$MODULE" # this is obsolete, but some code still depends on it + write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.") + +} # !build_pass + +} # isEmpty(MODULE_PRI) + load(qt_module_fwdpri) MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes) MODULE_PRIVATE_INCLUDES = $$eval(QT.$${MODULE}.private_includes) +INCLUDEPATH *= $$MODULE_INCLUDES INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES/$$TARGET -INCLUDEPATH *= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. #just for today to have some compat load(qt_module_headers) diff --git a/mkspecs/features/testlib_defines.prf b/mkspecs/features/testlib_defines.prf new file mode 100644 index 0000000000..59540689d3 --- /dev/null +++ b/mkspecs/features/testlib_defines.prf @@ -0,0 +1 @@ +DEFINES += QT_TESTCASE_BUILDDIR=\\\"$$OUT_PWD\\\" diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index 24f976ab92..5040d59a17 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -5,8 +5,6 @@ QPRO_PWD = $$PWD QT = core-private CONFIG += exceptions -MODULE_PRI = ../modules/qt_concurrent.pri - DEFINES += QT_BUILD_CONCURRENT_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 156176730e..e91d6cda79 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -6,7 +6,7 @@ QT = CONFIG += moc resources exceptions MODULE = core # not corelib, as per project file -MODULE_PRI = ../modules/qt_core.pri +MODULE_CONFIG = moc resources DEFINES += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000 diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 008b30952c..358c86baad 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -4,8 +4,7 @@ TARGET = QtDBus QPRO_PWD = $$PWD QT = core-private CONFIG += link_pkgconfig - -MODULE_PRI = ../modules/qt_dbus.pri +MODULE_CONFIG = dbusadaptors dbusinterfaces DEFINES += QT_BUILD_DBUS_LIB \ DBUS_API_SUBJECT_TO_CHANGE diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 915943bfad..d14e275353 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -3,8 +3,7 @@ load(qt_module) TARGET = QtGui QPRO_PWD = $$PWD QT = core-private - -MODULE_PRI = ../modules/qt_gui.pri +MODULE_CONFIG = opengl DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE diff --git a/src/modules/qt_concurrent.pri b/src/modules/qt_concurrent.pri deleted file mode 100644 index eccec12f66..0000000000 --- a/src/modules/qt_concurrent.pri +++ /dev/null @@ -1,15 +0,0 @@ -QT.concurrent.VERSION = 5.0.0 -QT.concurrent.MAJOR_VERSION = 5 -QT.concurrent.MINOR_VERSION = 0 -QT.concurrent.PATCH_VERSION = 0 - -QT.concurrent.name = QtConcurrent -QT.concurrent.bins = $$QT_MODULE_BIN_BASE -QT.concurrent.includes = $$QT_MODULE_INCLUDE_BASE/QtConcurrent -QT.concurrent.private_includes = $$QT_MODULE_INCLUDE_BASE/QtConcurrent/$$QT.concurrent.VERSION -QT.concurrent.sources = $$QT_MODULE_BASE/src/concurrent -QT.concurrent.libs = $$QT_MODULE_LIB_BASE -QT.concurrent.plugins = $$QT_MODULE_PLUGIN_BASE -QT.concurrent.imports = $$QT_MODULE_IMPORT_BASE -QT.concurrent.depends = core -QT.concurrent.DEFINES = QT_CONCURRENT_LIB diff --git a/src/modules/qt_core.pri b/src/modules/qt_core.pri deleted file mode 100644 index 81059923ab..0000000000 --- a/src/modules/qt_core.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.core.VERSION = 5.0.0 -QT.core.MAJOR_VERSION = 5 -QT.core.MINOR_VERSION = 0 -QT.core.PATCH_VERSION = 0 - -QT.core.name = QtCore -QT.core.bins = $$QT_MODULE_BIN_BASE -QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore -QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/$$QT.core.VERSION -QT.core.sources = $$QT_MODULE_BASE/src/corelib -QT.core.libs = $$QT_MODULE_LIB_BASE -QT.core.plugins = $$QT_MODULE_PLUGIN_BASE -QT.core.imports = $$QT_MODULE_IMPORT_BASE -QT.core.depends = -QT.core.DEFINES = QT_CORE_LIB -QT.core.CONFIG = moc resources diff --git a/src/modules/qt_dbus.pri b/src/modules/qt_dbus.pri deleted file mode 100644 index 8514265f8c..0000000000 --- a/src/modules/qt_dbus.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.dbus.VERSION = 5.0.0 -QT.dbus.MAJOR_VERSION = 5 -QT.dbus.MINOR_VERSION = 0 -QT.dbus.PATCH_VERSION = 0 - -QT.dbus.name = QtDBus -QT.dbus.bins = $$QT_MODULE_BIN_BASE -QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus -QT.dbus.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDBus/$$QT.dbus.VERSION -QT.dbus.sources = $$QT_MODULE_BASE/src/dbus -QT.dbus.libs = $$QT_MODULE_LIB_BASE -QT.dbus.plugins = $$QT_MODULE_PLUGIN_BASE -QT.dbus.imports = $$QT_MODULE_IMPORT_BASE -QT.dbus.depends = core -QT.dbus.CONFIG = dbusadaptors dbusinterfaces -QT.dbus.DEFINES = QT_DBUS_LIB diff --git a/src/modules/qt_gui.pri b/src/modules/qt_gui.pri deleted file mode 100644 index 2dfbb4a604..0000000000 --- a/src/modules/qt_gui.pri +++ /dev/null @@ -1,15 +0,0 @@ -QT.gui.VERSION = 5.0.0 -QT.gui.MAJOR_VERSION = 5 -QT.gui.MINOR_VERSION = 0 -QT.gui.PATCH_VERSION = 0 - -QT.gui.name = QtGui -QT.gui.includes = $$QT_MODULE_INCLUDE_BASE/QtGui -QT.gui.private_includes = $$QT_MODULE_INCLUDE_BASE/QtGui/$$QT.gui.VERSION -QT.gui.sources = $$QT_MODULE_BASE/src/gui -QT.gui.libs = $$QT_MODULE_LIB_BASE -QT.gui.plugins = $$QT_MODULE_PLUGIN_BASE -QT.gui.imports = $$QT_MODULE_IMPORT_BASE -QT.gui.depends = core -QT.gui.CONFIG = opengl -QT.gui.DEFINES = QT_GUI_LIB diff --git a/src/modules/qt_network.pri b/src/modules/qt_network.pri deleted file mode 100644 index 76b462286f..0000000000 --- a/src/modules/qt_network.pri +++ /dev/null @@ -1,15 +0,0 @@ -QT.network.VERSION = 5.0.0 -QT.network.MAJOR_VERSION = 5 -QT.network.MINOR_VERSION = 0 -QT.network.PATCH_VERSION = 0 - -QT.network.name = QtNetwork -QT.network.bins = $$QT_MODULE_BIN_BASE -QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork -QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/$$QT.network.VERSION -QT.network.sources = $$QT_MODULE_BASE/src/network -QT.network.libs = $$QT_MODULE_LIB_BASE -QT.network.plugins = $$QT_MODULE_PLUGIN_BASE -QT.network.imports = $$QT_MODULE_IMPORT_BASE -QT.network.depends = core -QT.network.DEFINES = QT_NETWORK_LIB diff --git a/src/modules/qt_opengl.pri b/src/modules/qt_opengl.pri deleted file mode 100644 index 22476cf949..0000000000 --- a/src/modules/qt_opengl.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.opengl.VERSION = 5.0.0 -QT.opengl.MAJOR_VERSION = 5 -QT.opengl.MINOR_VERSION = 0 -QT.opengl.PATCH_VERSION = 0 - -QT.opengl.name = QtOpenGL -QT.opengl.bins = $$QT_MODULE_BIN_BASE -QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL -QT.opengl.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL/$$QT.opengl.VERSION -QT.opengl.sources = $$QT_MODULE_BASE/src/opengl -QT.opengl.libs = $$QT_MODULE_LIB_BASE -QT.opengl.plugins = $$QT_MODULE_PLUGIN_BASE -QT.opengl.imports = $$QT_MODULE_IMPORT_BASE -QT.opengl.depends = core gui widgets -QT.opengl.CONFIG = opengl -QT.opengl.DEFINES = QT_OPENGL_LIB diff --git a/src/modules/qt_platformsupport.pri b/src/modules/qt_platformsupport.pri deleted file mode 100644 index 6671cc0584..0000000000 --- a/src/modules/qt_platformsupport.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.platformsupport.VERSION = 5.0.0 -QT.platformsupport.MAJOR_VERSION = 5 -QT.platformsupport.MINOR_VERSION = 0 -QT.platformsupport.PATCH_VERSION = 0 - -QT.platformsupport.name = QtPlatformSupport -QT.platformsupport.bins = $$QT_MODULE_BIN_BASE -QT.platformsupport.includes = $$QT_MODULE_INCLUDE_BASE/QtPlatformSupport -QT.platformsupport.private_includes = $$QT_MODULE_INCLUDE_BASE/QtPlatformSupport/$$QT.platformsupport.VERSION -QT.platformsupport.sources = $$QT_MODULE_BASE/src/platformsupport -QT.platformsupport.libs = $$QT_MODULE_LIB_BASE -QT.platformsupport.plugins = $$QT_MODULE_PLUGIN_BASE -QT.platformsupport.imports = $$QT_MODULE_IMPORT_BASE -QT.platformsupport.depends = core gui -QT.platformsupport.module_config = staticlib -QT.platformsupport.DEFINES = diff --git a/src/modules/qt_printsupport.pri b/src/modules/qt_printsupport.pri deleted file mode 100644 index 85603296a6..0000000000 --- a/src/modules/qt_printsupport.pri +++ /dev/null @@ -1,14 +0,0 @@ -QT.printsupport.VERSION = 5.0.0 -QT.printsupport.MAJOR_VERSION = 5 -QT.printsupport.MINOR_VERSION = 0 -QT.printsupport.PATCH_VERSION = 0 - -QT.printsupport.name = QtPrintSupport -QT.printsupport.includes = $$QT_MODULE_INCLUDE_BASE/QtPrintSupport -QT.printsupport.private_includes = $$QT_MODULE_INCLUDE_BASE/QtPrintSupport/$$QT.printsupport.VERSION -QT.printsupport.sources = $$QT_MODULE_BASE/src/printsupport -QT.printsupport.libs = $$QT_MODULE_LIB_BASE -QT.printsupport.plugins = $$QT_MODULE_PLUGIN_BASE -QT.printsupport.imports = $$QT_MODULE_IMPORT_BASE -QT.printsupport.depends = core gui widgets -QT.printsupport.DEFINES = QT_PRINTSUPPORT_LIB diff --git a/src/modules/qt_sql.pri b/src/modules/qt_sql.pri deleted file mode 100644 index 02f48d2a6b..0000000000 --- a/src/modules/qt_sql.pri +++ /dev/null @@ -1,15 +0,0 @@ -QT.sql.VERSION = 5.0.0 -QT.sql.MAJOR_VERSION = 5 -QT.sql.MINOR_VERSION = 0 -QT.sql.PATCH_VERSION = 0 - -QT.sql.name = QtSql -QT.sql.bins = $$QT_MODULE_BIN_BASE -QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql -QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/$$QT.sql.VERSION -QT.sql.sources = $$QT_MODULE_BASE/src/sql -QT.sql.libs = $$QT_MODULE_LIB_BASE -QT.sql.plugins = $$QT_MODULE_PLUGIN_BASE -QT.sql.imports = $$QT_MODULE_IMPORT_BASE -QT.sql.depends = core -QT.sql.DEFINES = QT_SQL_LIB diff --git a/src/modules/qt_testlib.pri b/src/modules/qt_testlib.pri deleted file mode 100644 index 8f6a342a58..0000000000 --- a/src/modules/qt_testlib.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.testlib.VERSION = 5.0.0 -QT.testlib.MAJOR_VERSION = 5 -QT.testlib.MINOR_VERSION = 0 -QT.testlib.PATCH_VERSION = 0 - -QT.testlib.name = QtTest -QT.testlib.bins = $$QT_MODULE_BIN_BASE -QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest -QT.testlib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtTest/$$QT.testlib.VERSION -QT.testlib.sources = $$QT_MODULE_BASE/src/testlib -QT.testlib.libs = $$QT_MODULE_LIB_BASE -QT.testlib.plugins = $$QT_MODULE_PLUGIN_BASE -QT.testlib.imports = $$QT_MODULE_IMPORT_BASE -QT.testlib.depends = core -QT.testlib.CONFIG = console -QT.testlib.DEFINES = QT_TESTLIB_LIB QT_TESTCASE_BUILDDIR=\\\"$$OUT_PWD\\\" diff --git a/src/modules/qt_widgets.pri b/src/modules/qt_widgets.pri deleted file mode 100644 index 69ad509dc3..0000000000 --- a/src/modules/qt_widgets.pri +++ /dev/null @@ -1,16 +0,0 @@ -QT.widgets.VERSION = 5.0.0 -QT.widgets.MAJOR_VERSION = 5 -QT.widgets.MINOR_VERSION = 0 -QT.widgets.PATCH_VERSION = 0 - -QT.widgets.name = QtWidgets -QT.widgets.bins = $$QT_MODULE_BIN_BASE -QT.widgets.includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets -QT.widgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets/$$QT.widgets.VERSION -QT.widgets.sources = $$QT_MODULE_BASE/src/widgets -QT.widgets.libs = $$QT_MODULE_LIB_BASE -QT.widgets.plugins = $$QT_MODULE_PLUGIN_BASE -QT.widgets.imports = $$QT_MODULE_IMPORT_BASE -QT.widgets.depends = core gui -QT.widgets.DEFINES = QT_WIDGETS_LIB -QT.widgets.CONFIG = uic diff --git a/src/modules/qt_xml.pri b/src/modules/qt_xml.pri deleted file mode 100644 index ea831236e6..0000000000 --- a/src/modules/qt_xml.pri +++ /dev/null @@ -1,15 +0,0 @@ -QT.xml.VERSION = 5.0.0 -QT.xml.MAJOR_VERSION = 5 -QT.xml.MINOR_VERSION = 0 -QT.xml.PATCH_VERSION = 0 - -QT.xml.name = QtXml -QT.xml.bins = $$QT_MODULE_BIN_BASE -QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml -QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/$$QT.xml.VERSION -QT.xml.sources = $$QT_MODULE_BASE/src/xml -QT.xml.libs = $$QT_MODULE_LIB_BASE -QT.xml.plugins = $$QT_MODULE_PLUGIN_BASE -QT.xml.imports = $$QT_MODULE_IMPORT_BASE -QT.xml.depends = core -QT.xml.DEFINES = QT_XML_LIB diff --git a/src/network/network.pro b/src/network/network.pro index ef63f7e385..a1f1698c0a 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -4,8 +4,6 @@ load(qt_module) TARGET = QtNetwork QPRO_PWD = $$PWD -MODULE_PRI = ../modules/qt_network.pri - DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE #DEFINES += QLOCALSERVER_DEBUG QLOCALSOCKET_DEBUG #DEFINES += QNETWORKDISKCACHE_DEBUG diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index e5951de7ad..9e1394fd83 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -4,8 +4,6 @@ TARGET = QtOpenGL QPRO_PWD = $$PWD QT = core-private gui-private widgets-private -MODULE_PRI = ../modules/qt_opengl.pri - DEFINES += QT_BUILD_OPENGL_LIB DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000 diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 23d840fcbb..1c6ea6c905 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -1,15 +1,11 @@ load(qt_module) TARGET = QtPlatformSupport QPRO_PWD = $$PWD -QT += core-private gui-private -TEMPLATE = lib -DESTDIR = $$QT.gui.libs +QT = core-private gui-private CONFIG += staticlib mac:LIBS += -lz -framework CoreFoundation -framework Carbon -MODULE_PRI = ../modules/qt_platformsupport.pri - DEFINES += QT_BUILD_PLATFORMSUPPORT_LIB load(qt_module_config) diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro index aa5ce2ea07..fb8a518ec3 100644 --- a/src/printsupport/printsupport.pro +++ b/src/printsupport/printsupport.pro @@ -4,8 +4,6 @@ TARGET = QtPrintSupport QPRO_PWD = $$PWD QT = core-private gui-private widgets-private -MODULE_PRI = ../modules/qt_printsupport.pri - DEFINES += QT_BUILD_PRINTSUPPORT_LIB QT_NO_USING_NAMESPACE unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui diff --git a/src/sql/sql.pro b/src/sql/sql.pro index ac730496fa..26e73e5258 100644 --- a/src/sql/sql.pro +++ b/src/sql/sql.pro @@ -4,8 +4,6 @@ TARGET = QtSql QPRO_PWD = $$PWD QT = core-private -MODULE_PRI = ../modules/qt_sql.pri - DEFINES += QT_BUILD_SQL_LIB DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000 diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index ee29fa7fa4..56d17b2d7a 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -5,7 +5,7 @@ QPRO_PWD = $$PWD QT = core-private CONFIG += exceptions -MODULE_PRI = ../modules/qt_testlib.pri +MODULE_CONFIG = console testlib_defines INCLUDEPATH += . unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \ diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index ee7a65141c..f3e14b73b0 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -2,10 +2,8 @@ load(qt_module) TARGET = QtWidgets QPRO_PWD = $$PWD -QT = core core-private gui gui-private platformsupport-private -CONFIG += uic - -MODULE_PRI = ../modules/qt_widgets.pri +QT = core-private gui-private +MODULE_CONFIG = uic DEFINES += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 diff --git a/src/xml/xml.pro b/src/xml/xml.pro index a890730977..4b17f62b48 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -4,8 +4,6 @@ TARGET = QtXml QPRO_PWD = $$PWD QT = core-private -MODULE_PRI = ../modules/qt_xml.pri - DEFINES += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 diff --git a/sync.profile b/sync.profile index 5e17174a2d..95ef1fd729 100644 --- a/sync.profile +++ b/sync.profile @@ -42,20 +42,6 @@ "xml" => "#include \n", "concurrent" => "#include \n", ); -%modulepris = ( - "QtCore" => "$basedir/src/modules/qt_core.pri", - "QtDBus" => "$basedir/src/modules/qt_dbus.pri", - "QtGui" => "$basedir/src/modules/qt_gui.pri", - "QtPrintSupport" => "$basedir/src/modules/qt_printsupport.pri", - "QtWidgets" => "$basedir/src/modules/qt_widgets.pri", - "QtNetwork" => "$basedir/src/modules/qt_network.pri", - "QtOpenGL" => "$basedir/src/modules/qt_opengl.pri", - "QtSql" => "$basedir/src/modules/qt_sql.pri", - "QtTest" => "$basedir/src/modules/qt_testlib.pri", - "QtXml" => "$basedir/src/modules/qt_xml.pri", - "QtConcurrent" => "$basedir/src/modules/qt_concurrent.pri", - "QtPlatformSupport" => "$basedir/src/modules/qt_platformsupport.pri", -); %deprecatedheaders = ( "QtGui" => { "qplatformaccessibility_qpa.h" => "qpa/qplatformaccessibility.h", -- cgit v1.2.3