diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-03-30 14:59:03 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-03-30 14:59:03 (GMT) |
| commit | f9c434cd70663db2d1b1c32c8b68ae3ff85d6803 (patch) | |
| tree | 32ba957e42491ae7634c6a8999485a43e5f68f42 /mkspecs | |
| parent | e20d18f1982dde2b0fa9bd262e5aadd1e451a7fa (diff) | |
| parent | 097b3b3323ab6641c17318057e100543b60bca77 (diff) | |
| download | Qt-f9c434cd70663db2d1b1c32c8b68ae3ff85d6803.zip Qt-f9c434cd70663db2d1b1c32c8b68ae3ff85d6803.tar.gz Qt-f9c434cd70663db2d1b1c32c8b68ae3ff85d6803.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/default_post.prf | 3 |
1 files changed, 0 insertions, 3 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 |