diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-10 01:30:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-10 01:30:44 (GMT) |
| commit | 082b9125d627df11692f2a03b80c9e962e82eda5 (patch) | |
| tree | fee60bb2f217c1a22db68329beffc3d29a2498c9 /mkspecs | |
| parent | cb188229132e36ef1fe1af4c8e2db0df6047be76 (diff) | |
| parent | 22c35fb59aee3ae2cb70be891b4f0e376f4ff5c5 (diff) | |
| download | Qt-082b9125d627df11692f2a03b80c9e962e82eda5.zip Qt-082b9125d627df11692f2a03b80c9e962e82eda5.tar.gz Qt-082b9125d627df11692f2a03b80c9e962e82eda5.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Lancelot: bail out if rendering consistently fails
Minor optimization to lance/elot
Make it possible to test the new font hinting in lance[elot]
Fixes: The "test: too many arguments" error after every make
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/unix/gdb_dwarf_index.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf index 14c4c38..14db4fc 100644 --- a/mkspecs/features/unix/gdb_dwarf_index.prf +++ b/mkspecs/features/unix/gdb_dwarf_index.prf @@ -1,7 +1,7 @@ !CONFIG(separate_debug_info):CONFIG(debug, debug|release):!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) { QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } && \ - test \$\$(gdb --version | sed -e \'s,[^(]*(GDB)[^)]\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 && \ + test \$\$(gdb --version | sed -e \'s,[^0-9]\\+\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 && \ gdb --nx --batch --quiet -ex \'set confirm off\' -ex \'save gdb-index .\' -ex quit \'$(TARGET)\' && \ test -f $(TARGET).gdb-index && \ $$QMAKE_OBJCOPY --add-section \'.gdb_index=$(TARGET).gdb-index\' --set-section-flags \'.gdb_index=readonly\' \'$(TARGET)\' \'$(TARGET)\' && \ |