summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-10 09:14:49 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-10 09:14:49 (GMT)
commite0ef11578048620b3f107b7a357fed3aade0d21e (patch)
treef635b921a0ae8251facc1267a6cbb1d4cb341578
parent32dbad15095e048fffac72d5e6261207967a000a (diff)
parent8b671541be8c587a483aa4645c4ba8b7a56c6462 (diff)
downloadQt-e0ef11578048620b3f107b7a357fed3aade0d21e.zip
Qt-e0ef11578048620b3f107b7a357fed3aade0d21e.tar.gz
Qt-e0ef11578048620b3f107b7a357fed3aade0d21e.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: adjust phony target hack to gdb_dwarf_index addition
-rw-r--r--translations/translations.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/translations/translations.pro b/translations/translations.pro
index cdaf04a..14c1177 100644
--- a/translations/translations.pro
+++ b/translations/translations.pro
@@ -6,7 +6,7 @@ contains(TEMPLATE_PREFIX, vc):vcproj = 1
TEMPLATE = app
TARGET = qm_phony_target
-CONFIG -= qt separate_debug_info sis_targets
+CONFIG -= qt separate_debug_info gdb_dwarf_index sis_targets
CONFIG += no_icon
QT =
LIBS =