diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-21 06:15:04 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-21 06:15:04 (GMT) |
| commit | 6c5d190923fb23e2f644e71ac2393c25619848c8 (patch) | |
| tree | 78cf279084269f88dff58c4bc0ab33f2aa882866 /mkspecs/features/default_pre.prf | |
| parent | 2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315 (diff) | |
| parent | db87996d4ca90f8fffb5a8e012fa7f2336c038b0 (diff) | |
| download | Qt-6c5d190923fb23e2f644e71ac2393c25619848c8.zip Qt-6c5d190923fb23e2f644e71ac2393c25619848c8.tar.gz Qt-6c5d190923fb23e2f644e71ac2393c25619848c8.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Diffstat (limited to 'mkspecs/features/default_pre.prf')
| -rw-r--r-- | mkspecs/features/default_pre.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 6442594..2e82f03 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -1,2 +1,3 @@ load(exclusive_builds) +### Qt 5: remove "uic" and "resources" - or add "qt" CONFIG = lex yacc warn_on debug uic resources $$CONFIG |