diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-03-27 21:26:54 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-03-27 21:26:54 (GMT) |
| commit | 9748269cb58266fdfdac2c8820dad8c473dcf512 (patch) | |
| tree | 81cdd7830afb6507429594e133e18ca9f420dd8c /mkspecs | |
| parent | 9a33a0027883ab77c10d8a9d9d9df5b4c2c5d50b (diff) | |
| parent | ba25c4a832516124bcd97758de9eede32797c5a0 (diff) | |
| download | Qt-9748269cb58266fdfdac2c8820dad8c473dcf512.zip Qt-9748269cb58266fdfdac2c8820dad8c473dcf512.tar.gz Qt-9748269cb58266fdfdac2c8820dad8c473dcf512.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tools/linguist/lupdate/qscript.cpp
tools/linguist/lupdate/qscript.g
tools/linguist/lupdate/ui.cpp
tools/linguist/shared/cpp.cpp
tools/linguist/shared/qph.cpp
tools/linguist/shared/translator.h
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/default_post.prf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index 01074f4..424609e 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 |