diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-03-26 23:06:27 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-03-27 12:10:33 +0100 |
| commit | 7d2c8eb99c563b4fb236fe538123255f52f293a2 (patch) | |
| tree | a98351d788ef1447f1e8235ff40c67d729219151 | |
| parent | 763f816a73feb29d235bf146db1aa18b46ba996e (diff) | |
don't include uic in non-gui configurations
uic is set in default_pre. this leads to useless -I compiler flags when
no ui files are used in fact, so it would be nice to get rid of it in
cases where it is not used. for backwards compat, don't remove it from
the _pre, but add some magic to _post to remove it again if QT does not
contain gui. of course, we need a force_uic CONFIG to enable an
exception for QtGui itself ...
| -rw-r--r-- | mkspecs/features/default_post.prf | 3 | ||||
| -rw-r--r-- | src/gui/gui.pro | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index 01074f4f8b..424609e122 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -6,5 +6,8 @@ incredibuild_xge { CONFIG = incredibuild_xge $$CONFIG } +# It's in the default config. Get rid of it now if unused. +!contains(QT, [Gg][Uu][Ii]):!CONFIG(force_uic):CONFIG -= uic + QMAKE_INCDIR += $$QMAKE_INCDIR_POST QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST diff --git a/src/gui/gui.pro b/src/gui/gui.pro index f224e67d05..0d3bbc6802 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -1,6 +1,7 @@ TARGET = QtGui QPRO_PWD = $$PWD QT = core +CONFIG += force_uic DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 |