From 1e68ec7e6756baa62353ad9f017b48bf031a7354 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Sep 2012 11:38:00 +0200 Subject: [PATCH] remove explicit load(qt_build_config)s from the libraries .qmake.conf (and previously .qmake.cache) already does that for us. Change-Id: I06cc01fa45921d7bd66dda7a0f88729faeff37bd Reviewed-by: Joerg Bornemann --- src/concurrent/concurrent.pro | 2 -- src/corelib/corelib.pro | 2 -- src/dbus/dbus.pro | 2 -- src/gui/gui.pro | 2 -- src/network/network.pro | 2 -- src/opengl/opengl.pro | 2 -- src/platformsupport/platformsupport.pro | 1 - src/printsupport/printsupport.pro | 2 -- src/sql/sql.pro | 2 -- src/testlib/testlib.pro | 2 -- src/widgets/widgets.pro | 2 -- src/winmain/winmain.pro | 2 -- src/xml/xml.pro | 2 -- 13 files changed, 25 deletions(-) diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index cfa76ff..375de00 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtConcurrent QT = core-private CONFIG += exceptions diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index b83b2ba..ba9488c 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtCore QT = CONFIG += exceptions diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 1793871..5ad77dd 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtDBus QT = core-private CONFIG += link_pkgconfig diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 8b7bb13..301d704 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtGui QT = core-private MODULE_CONFIG = opengl diff --git a/src/network/network.pro b/src/network/network.pro index 09791d7..d2b2447 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtNetwork QT = core-private diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index dfc342c..57892c7 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtOpenGL QT = core-private gui-private widgets-private diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 5cb8833..57d9b42 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -1,4 +1,3 @@ -load(qt_build_config) TARGET = QtPlatformSupport QT = core-private gui-private diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro index bc8b393..ee4f9f7 100644 --- a/src/printsupport/printsupport.pro +++ b/src/printsupport/printsupport.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtPrintSupport QT = core-private gui-private widgets-private diff --git a/src/sql/sql.pro b/src/sql/sql.pro index 42d3364..4f5af51 100644 --- a/src/sql/sql.pro +++ b/src/sql/sql.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtSql QT = core-private diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index c14f6e0..06d7612 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtTest QT = core-private CONFIG += exceptions diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index f294934..f8f00af 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtWidgets QT = core-private gui-private MODULE_CONFIG = uic diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index 0fa4dca..843a159 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - # Additional Qt project file for qtmain lib on Windows !win32:error("$$_FILE_ is intended only for Windows!") diff --git a/src/xml/xml.pro b/src/xml/xml.pro index 80fe3a9..c4b8b5b 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -1,5 +1,3 @@ -load(qt_build_config) - TARGET = QtXml QT = core-private -- 2.7.4