diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-03-30 00:21:13 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-03-30 00:28:11 (GMT) |
| commit | 489da53d86c41d4cb0ce4e533c40b7f5dcae4d0e (patch) | |
| tree | 04dae3b4054fb3b17e1c2f4a056c44781e82fa79 | |
| parent | ff30a91eedd30c0e2e0b62ad50ade3d7d27651a8 (diff) | |
| download | Qt-489da53d86c41d4cb0ce4e533c40b7f5dcae4d0e.zip Qt-489da53d86c41d4cb0ce4e533c40b7f5dcae4d0e.tar.gz Qt-489da53d86c41d4cb0ce4e533c40b7f5dcae4d0e.tar.bz2 | |
Revert "don't include uic in non-gui configurations"
This reverts commit 7d2c8eb99c563b4fb236fe538123255f52f293a2.
This commit was not reviewed and breaks compile of QtNetwork on win32
with this error...
src\network\kernel\qauthenticator.cpp(55) : fatal error C1083: Cannot
open include file: '../3rdparty/des/des.cpp': No such file or
directory
... because the generated Makefile no longer contains src/network
as an include path.
| -rw-r--r-- | mkspecs/features/default_post.prf | 3 | ||||
| -rw-r--r-- | src/gui/gui.pro | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index 424609e..01074f4 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -6,8 +6,5 @@ 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 0d3bbc6..f224e67 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -1,7 +1,6 @@ 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 |