From 9b59e51c5064c67c423389c2c884d009903910c7 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 11 Feb 2014 14:10:00 +0100 Subject: fix warning when generating VS 2013 project /FS forces the compiler to synchronize pdb file writes. This option is not needed when building with Visual Studio itself. Still, qmake needs to know it when parsing the compiler flags. Task-number: QTBUG-36535 Change-Id: Id5b68c4028844e0b95904e08b5121310a4ff13d6 Reviewed-by: Andy Shaw --- qmake/generators/win32/msvc_objectmodel.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 8159cf58e2..a2a441c6bf 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -510,6 +510,11 @@ bool VCCLCompilerTool::parseOption(const char* option) BrowseInformation = brAllInfo; BrowseInformationFile = option+3; break; + case 'S': + if (config->CompilerVersion < NET2013) + found = false; + // Ignore this flag. Visual Studio 2013 takes care of this setting. + break; case 'r': BrowseInformation = brNoLocalSymbols; BrowseInformationFile = option+3; -- cgit v1.2.3 From 93500422d120d1090e60f6d1c0ad75fe30d4e806 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 5 Feb 2014 09:15:28 +0100 Subject: Delete the children before updating the Cocoa menubar When the Cocoa menubar is updated then it ensures that the merged native menu items are visible if appropriate. However when the old menubar is deleted then it causes the merged native items to be hidden. Therefore we ensure the children are deleted first which causes the native items to be hidden and then update the menubar so that they can be correctly visible if they should be. Change-Id: I426864a5d2ec1f34c03290ac66371b12bf77cc00 Reviewed-by: Gabriel de Dietrich --- src/plugins/platforms/cocoa/qcocoamenubar.mm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm index 5a8664747e..7335deb800 100644 --- a/src/plugins/platforms/cocoa/qcocoamenubar.mm +++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm @@ -79,6 +79,10 @@ QCocoaMenuBar::~QCocoaMenuBar() if (m_window && m_window->menubar() == this) { m_window->setMenubar(0); + // Delete the children first so they do not cause + // the native menu items to be hidden after + // the menu bar was updated + qDeleteAll(children()); updateMenuBarImmediately(); } } -- cgit v1.2.3 From 7df3321f934e5bd618e2ad00bf801f2b7edd31df Mon Sep 17 00:00:00 2001 From: Andrey Volkov Date: Wed, 12 Feb 2014 17:54:01 +0400 Subject: fix crash when using GTK 2.14 function in old gtk This is additional fix for bug 23569. Previous fix (SHA1 7fcf1cf674d09d9dd1d41e2913252017f1d599ca) is not enough. QGtkStyle was still crashing with old gtk (< 2.14) in drawComplexControl () function. Bug was reproducible on CentOS 5.x and Red Hat 5.x. Current patch makes the same check as in commit mentioned but in another line of code. Task-number: QTBUG-23569 Change-Id: I261b61bc93ccaada879ed02ad4d0bef62935335b Reviewed-by: Jens Bache-Wiig Reviewed-by: Andy Shaw Reviewed-by: Harri Porten --- src/widgets/styles/qgtkstyle.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp index b981aef98b..105aefb14c 100644 --- a/src/widgets/styles/qgtkstyle.cpp +++ b/src/widgets/styles/qgtkstyle.cpp @@ -2499,7 +2499,9 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom if ((option->subControls & SC_SliderGroove) && groove.isValid()) { GtkRange *range = (GtkRange*)scaleWidget; - GtkAdjustment *adjustment = d->gtk_range_get_adjustment(range); + GtkAdjustment *adjustment = 0; + if (d->gtk_adjustment_configure) + adjustment = d->gtk_range_get_adjustment(range); if (adjustment) { d->gtk_adjustment_configure(adjustment, slider->sliderPosition, -- cgit v1.2.3 From 8e261ac756132baeb857fb15013cde126ffa22cc Mon Sep 17 00:00:00 2001 From: Glen Mabey Date: Fri, 7 Feb 2014 08:53:27 -0600 Subject: Added #include "qnumeric.h" to qglobal.h Including qnumeric.h causes QtGlobal to have all of the functions that the documentation indicates that it brings. Task-number: QTBUG-36715 Change-Id: Ib08ccc18a85dfe4ecd18ef1dfbfec3e90ab8ec2c Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- src/corelib/global/qglobal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index cd3b0fe71c..cd7899021d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1042,6 +1042,7 @@ QT_END_NAMESPACE #include #include #include +#include #endif /* __cplusplus */ -- cgit v1.2.3 From 2b26f801b5b49e2f354da0b67070917d25d5917d Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 4 Mar 2013 16:52:12 +0100 Subject: Make parsing of template arguments more robust. At first, my goal was just to fix Moc::until() to parse properly template arguments containing expressions containing > or >> such as Foo<(8>>2)> But with the test, I realized that normalizeType also requires change not to split the > > too much. And QMetaObjectPrivate::decodeMethodSignature should not interpret the ) within the template parameter as the end of the function. Change-Id: Ia9d3a2a786368aeda1edcf66280d70f64cf05070 Reviewed-by: Lars Knoll --- src/corelib/kernel/qmetaobject.cpp | 2 +- src/corelib/kernel/qmetaobject_moc_p.h | 31 ++++++++++++++++----------- src/tools/moc/moc.cpp | 38 ++++++++++++++++++++-------------- tests/auto/tools/moc/tst_moc.cpp | 19 +++++++++++++++++ 4 files changed, 62 insertions(+), 28 deletions(-) diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index ff2675dfc8..1e11887387 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -677,7 +677,7 @@ QByteArray QMetaObjectPrivate::decodeMethodSignature( const char *lparens = strchr(signature, '('); if (!lparens) return QByteArray(); - const char *rparens = strchr(lparens + 1, ')'); + const char *rparens = strrchr(lparens + 1, ')'); if (!rparens || *(rparens+1)) return QByteArray(); int nameLength = lparens - signature; diff --git a/src/corelib/kernel/qmetaobject_moc_p.h b/src/corelib/kernel/qmetaobject_moc_p.h index c791f017d4..d26cd54e5d 100644 --- a/src/corelib/kernel/qmetaobject_moc_p.h +++ b/src/corelib/kernel/qmetaobject_moc_p.h @@ -155,21 +155,28 @@ static QByteArray normalizeTypeInternal(const char *t, const char *e, bool fixSc //template recursion const char* tt = t; int templdepth = 1; + int scopeDepth = 0; while (t != e) { c = *t++; - if (c == '<') - ++templdepth; - if (c == '>') - --templdepth; - if (templdepth == 0 || (templdepth == 1 && c == ',')) { - result += normalizeTypeInternal(tt, t-1, fixScope, false); - result += c; - if (templdepth == 0) { - if (*t == '>') - result += ' '; // avoid >> - break; + if (c == '{' || c == '(' || c == '[') + ++scopeDepth; + if (c == '}' || c == ')' || c == ']') + --scopeDepth; + if (scopeDepth == 0) { + if (c == '<') + ++templdepth; + if (c == '>') + --templdepth; + if (templdepth == 0 || (templdepth == 1 && c == ',')) { + result += normalizeTypeInternal(tt, t-1, fixScope, false); + result += c; + if (templdepth == 0) { + if (*t == '>') + result += ' '; // avoid >> + break; + } + tt = t; } - tt = t; } } } diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 8ff481d5b1..22cbb97364 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -224,14 +224,7 @@ Type Moc::parseType() ; } if (test(LANGLE)) { - QByteArray templ = lexemUntil(RANGLE); - for (int i = 0; i < templ.size(); ++i) { - type.name += templ.at(i); - if ((templ.at(i) == '<' && i+1 < templ.size() && templ.at(i+1) == ':') - || (templ.at(i) == '>' && i+1 < templ.size() && templ.at(i+1) == '>')) { - type.name += ' '; - } - } + type.name += lexemUntil(RANGLE); } if (test(SCOPE)) { type.name += lexem(); @@ -1395,10 +1388,14 @@ QByteArray Moc::lexemUntil(Token target) QByteArray s; while (from <= index) { QByteArray n = symbols.at(from++-1).lexem(); - if (s.size() && n.size() - && is_ident_char(s.at(s.size()-1)) - && is_ident_char(n.at(0))) - s += ' '; + if (s.size() && n.size()) { + char prev = s.at(s.size()-1); + char next = n.at(0); + if ((is_ident_char(prev) && is_ident_char(next)) + || (prev == '<' && next == ':') + || (prev == '>' && next == '>')) + s += ' '; + } s += n; } return s; @@ -1433,9 +1430,20 @@ bool Moc::until(Token target) { case RBRACK: --brackCount; break; case LPAREN: ++parenCount; break; case RPAREN: --parenCount; break; - case LANGLE: ++angleCount; break; - case RANGLE: --angleCount; break; - case GTGT: angleCount -= 2; t = RANGLE; break; + case LANGLE: + if (parenCount == 0 && braceCount == 0 && parenCount == 0) + ++angleCount; + break; + case RANGLE: + if (parenCount == 0 && braceCount == 0) + --angleCount; + break; + case GTGT: + if (parenCount == 0 && braceCount == 0) { + angleCount -= 2; + t = RANGLE; + } + break; default: break; } if (t == target diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index 8ce55cbdf5..e26b02a560 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -1538,13 +1538,30 @@ class QTBUG12260_defaultTemplate_Object : public QObject public slots: #if !(defined(Q_CC_GNU) && __GNUC__ == 4 && __GNUC_MINOR__ <= 3) || defined(Q_MOC_RUN) void doSomething(QHash values = QHash() ) { Q_UNUSED(values); } + void doSomethingElse(QSharedPointer> 2)> > val + = QSharedPointer> 2)> >() ) + { Q_UNUSED(val); } #else // we want to test the previous function, but gcc < 4.4 seemed to have a bug similar to the one moc has. typedef QHash WorkaroundGCCBug; void doSomething(QHash values = WorkaroundGCCBug() ) { Q_UNUSED(values); } + void doSomethingElse(QSharedPointer> 2)> > val + = (QSharedPointer> 2)> >()) ) + { Q_UNUSED(val); } #endif void doAnotherThing(bool a = (1 < 3), bool b = (1 > 4)) { Q_UNUSED(a); Q_UNUSED(b); } + +#if defined(Q_MOC_RUN) || (defined(Q_COMPILER_AUTO_TYPE) && !(defined(Q_CC_CLANG) && (__clang_major__ * 100) + __clang_minor__) < 304) + // There is no Q_COMPILER_>> but if compiler support auto, it should also support >> + void performSomething(QVector> e = QVector>(8 < 1), + QHash> h = QHash>()) + { Q_UNUSED(e); Q_UNUSED(h); } +#else + void performSomething(QVector > e = QVector >(), + QHash > h = (QHash >())) + { Q_UNUSED(e); Q_UNUSED(h); } +#endif }; @@ -1552,6 +1569,8 @@ void tst_Moc::QTBUG12260_defaultTemplate() { QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("doSomething(QHash)") != -1); QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("doAnotherThing(bool,bool)") != -1); + QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("doSomethingElse(QSharedPointer>2)> >)") != -1); + QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("performSomething(QVector >,QHash >)") != -1); } void tst_Moc::notifyError() -- cgit v1.2.3 From fa6ebaa2e9734af461db153a11d08082779de1e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Wed, 12 Feb 2014 19:33:18 +0100 Subject: Draw more inactive style elements in retina res. Update drawColorLessButton() and qt_mac_cg_context() to handle paint devices with a devicePixelRatio greater than one. Task-number: QTBUG-36792 Change-Id: I9d642846b299fc7048bb8e08765b9e1d7ee631fc Reviewed-by: Denis Dzyubenko Reviewed-by: Gabriel de Dietrich --- src/widgets/styles/qmacstyle_mac.mm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index fa49bcb884..79a52c00cb 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -1719,8 +1719,9 @@ void QMacStylePrivate::drawColorlessButton(const HIRect &macRect, HIThemeButtonD } } - int width = int(macRect.size.width) + extraWidth; - int height = int(macRect.size.height) + extraHeight; + int devicePixelRatio = p->device()->devicePixelRatio(); + int width = devicePixelRatio * (int(macRect.size.width) + extraWidth); + int height = devicePixelRatio * (int(macRect.size.height) + extraHeight); if (width <= 0 || height <= 0) return; // nothing to draw @@ -1732,6 +1733,7 @@ void QMacStylePrivate::drawColorlessButton(const HIRect &macRect, HIThemeButtonD QPixmap pm; if (!QPixmapCache::find(key, pm)) { QPixmap activePixmap(width, height); + activePixmap.setDevicePixelRatio(devicePixelRatio); activePixmap.fill(Qt::transparent); { if (combo){ @@ -1782,6 +1784,7 @@ void QMacStylePrivate::drawColorlessButton(const HIRect &macRect, HIThemeButtonD QImage colorlessImage; { QPixmap colorlessPixmap(width, height); + colorlessPixmap.setDevicePixelRatio(devicePixelRatio); colorlessPixmap.fill(Qt::transparent); QMacCGContext cg(&colorlessPixmap); @@ -1815,7 +1818,7 @@ void QMacStylePrivate::drawColorlessButton(const HIRect &macRect, HIThemeButtonD } QPixmapCache::insert(key, pm); } - p->drawPixmap(int(macRect.origin.x) - xoff, int(macRect.origin.y) + finalyoff, width, height, pm); + p->drawPixmap(int(macRect.origin.x) - xoff, int(macRect.origin.y) + finalyoff, width / devicePixelRatio, height / devicePixelRatio , pm); } QMacStyle::QMacStyle() @@ -6719,6 +6722,8 @@ CGContextRef qt_mac_cg_context(const QPaintDevice *pdev) } CGContextTranslateCTM(ret, 0, pm->height()); + int devicePixelRatio = pdev->devicePixelRatio(); + CGContextScaleCTM(ret, devicePixelRatio, devicePixelRatio); CGContextScaleCTM(ret, 1, -1); return ret; } else if (pdev->devType() == QInternal::Widget) { -- cgit v1.2.3 From 37f4f7bc271db700232dc2a12885a8b3bafa6100 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 12 Feb 2014 16:30:33 +0100 Subject: Remove incomplete paragraph from QSet::iterator documentation I could trace the dangling 'However, ' back to Qt 4.2. We probably will never knew what the rest of the sentence was, exactly ... since the previous paragraph is anyhow covering the same grounds we can just remove the paragraph. Change-Id: I1dda56e1ad17932205b8f40a527ca90a7592ad40 Reviewed-by: Ulf Hermann Reviewed-by: Thiago Macieira --- src/corelib/tools/qset.qdoc | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc index e66a59a09c..ab7d72611e 100644 --- a/src/corelib/tools/qset.qdoc +++ b/src/corelib/tools/qset.qdoc @@ -621,9 +621,6 @@ unless you need to change the QSet through the iterator. Const iterators are slightly faster, and can improve code readability. - QSet\::iterator allows you to iterate over a QSet\ and - modify it as you go (using QSet::erase()). However, - The default QSet::iterator constructor creates an uninitialized iterator. You must initialize it using a function like QSet::begin(), QSet::end(), or QSet::insert() before you can -- cgit v1.2.3 From 4179302d6572c6d898a61cf19f3f3b96ef3d9574 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Thu, 13 Feb 2014 10:45:27 +0100 Subject: Doc: Adding a new page to Qt Creator's external page file. -new page called "Creating an Android Applicaion" Change-Id: Ibe17f7c96aee3fe6c549a27d3b0f2b93cc0a5453 Reviewed-by: Leena Miettinen --- doc/global/externalsites/qtcreator.qdoc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc index 0a6e8dc5d1..15a4125250 100644 --- a/doc/global/externalsites/qtcreator.qdoc +++ b/doc/global/externalsites/qtcreator.qdoc @@ -467,3 +467,11 @@ \externalpage http://qt-project.org/doc/qtcreator/creator-debuggers.html \title Qt Creator: Adding Debuggers */ +/*! + \externalpage http://qt-project.org/doc/qtcreator/creator-android-app-tutorial.html + \title Qt Creator: Creating an Android Application +*/ +/*! + \externalpage http://qt-project.org/doc/qtcreator/creator-diff-editor.html + \title Qt Creator: Comparing Files +*/ -- cgit v1.2.3 From 2b0f02aa5cc0f7d1b460d2d324d5d08c6f6d61b9 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 13 Feb 2014 11:13:30 +0100 Subject: moc: Fix parsing of operator< MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit moc would skip the 'operator' keyword as unknown and try to parse a type again but as it sees the '<' it looks for the corresponding '>' which does not exist types can't start with '<' anyway, so return an invalid type and continue parsing as usual Task-number: QTBUG-36834 Change-Id: If3d27076ef9947abf8c57c594713eece9334d0b0 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki --- src/tools/moc/moc.cpp | 4 ++++ tests/auto/tools/moc/tst_moc.cpp | 1 + 2 files changed, 5 insertions(+) diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 22cbb97364..b26fac5dcf 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -224,6 +224,10 @@ Type Moc::parseType() ; } if (test(LANGLE)) { + if (type.name.isEmpty()) { + // '<' cannot start a type + return type; + } type.name += lexemUntil(RANGLE); } if (test(SCOPE)) { diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index e26b02a560..bf2d6afdb4 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -128,6 +128,7 @@ public: emit send(value); } + bool operator< ( const Sender & ) const { /* QTBUG-36834 */ return true;} signals: void send(const String::Type&); void send(const Int::Type&); -- cgit v1.2.3 From 9de2853a942529f88815ed29375ff4efc44d168c Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 14 Jan 2014 14:23:49 +0100 Subject: Remove automated generation of dwarf index The index is only helpful if the version of GDB to create it uses the same version as the GDB version that consumes it. Outside the "local development" scenario this happens only by conincidence, still we add ~3.6% to the debug library size and face maintenance issues like QTBUG-34950. We also don't see the same performance benefit anymore with recent versions as we did when the feature was added, so it's best to not create the index anymore. People who need it, still can add it manually, or by the 'gdb-add-index' tool that comes with recent versions of GDB, or trust their distributors to set up indexes matching their runtime environment. Task-number: QTBUG-34950 Change-Id: Id4c79fa51fea9622b0891bd9b9b395b948ecb157 Reviewed-by: Oswald Buddenhagen --- mkspecs/devices/common/linux_device_pre.conf | 2 +- mkspecs/devices/linux-archos-gen8-g++/qmake.conf | 2 +- .../devices/linux-arm-amlogic-8726M-g++/qmake.conf | 2 +- .../linux-arm-trident-pnx8473-g++/qmake.conf | 2 +- mkspecs/devices/linux-beagleboard-g++/qmake.conf | 2 +- mkspecs/devices/linux-maemo-n9-g++/qmake.conf | 2 +- .../linux-mipsel-broadcom-97425-g++/qmake.conf | 2 +- .../linux-sh4-stmicro-ST7108-g++/qmake.conf | 2 +- .../linux-sh4-stmicro-ST7540-g++/qmake.conf | 2 +- mkspecs/devices/linux-snowball-g++/qmake.conf | 2 +- mkspecs/features/unix/gdb_dwarf_index.prf | 23 ---------------------- mkspecs/freebsd-g++/qmake.conf | 1 - mkspecs/freebsd-g++46/qmake.conf | 1 - mkspecs/hurd-g++/qmake.conf | 2 +- mkspecs/linux-arm-gnueabi-g++/qmake.conf | 2 +- mkspecs/linux-g++-32/qmake.conf | 2 +- mkspecs/linux-g++-64/qmake.conf | 2 +- mkspecs/linux-g++-maemo/qmake.conf | 2 +- mkspecs/linux-g++/qmake.conf | 2 +- mkspecs/linux-icc/qmake.conf | 1 - mkspecs/linux-llvm/qmake.conf | 2 +- mkspecs/linux-lsb-g++/qmake.conf | 2 +- mkspecs/netbsd-g++/qmake.conf | 1 - mkspecs/openbsd-g++/qmake.conf | 1 - 24 files changed, 18 insertions(+), 46 deletions(-) delete mode 100644 mkspecs/features/unix/gdb_dwarf_index.prf diff --git a/mkspecs/devices/common/linux_device_pre.conf b/mkspecs/devices/common/linux_device_pre.conf index a4837a435d..16becbdd52 100644 --- a/mkspecs/devices/common/linux_device_pre.conf +++ b/mkspecs/devices/common/linux_device_pre.conf @@ -1,7 +1,7 @@ QT_QPA_DEFAULT_PLATFORM = eglfs MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../../common/linux.conf) diff --git a/mkspecs/devices/linux-archos-gen8-g++/qmake.conf b/mkspecs/devices/linux-archos-gen8-g++/qmake.conf index 6f2b4736ac..891559f3bf 100644 --- a/mkspecs/devices/linux-archos-gen8-g++/qmake.conf +++ b/mkspecs/devices/linux-archos-gen8-g++/qmake.conf @@ -7,7 +7,7 @@ # http://github.com/KDAB/OpenEmbedded-Archos MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../../common/linux.conf) diff --git a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf index 90f0d90a3c..da2e046d08 100644 --- a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf +++ b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../../common/linux.conf) diff --git a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf index d734e97e89..011fc6fe28 100644 --- a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf +++ b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf @@ -5,7 +5,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../../common/linux.conf) diff --git a/mkspecs/devices/linux-beagleboard-g++/qmake.conf b/mkspecs/devices/linux-beagleboard-g++/qmake.conf index 0791693bbe..d78048951f 100644 --- a/mkspecs/devices/linux-beagleboard-g++/qmake.conf +++ b/mkspecs/devices/linux-beagleboard-g++/qmake.conf @@ -3,7 +3,7 @@ # http://beagleboard.org/ MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../../common/linux.conf) diff --git a/mkspecs/devices/linux-maemo-n9-g++/qmake.conf b/mkspecs/devices/linux-maemo-n9-g++/qmake.conf index a9e2376d7c..1c18fc5c80 100644 --- a/mkspecs/devices/linux-maemo-n9-g++/qmake.conf +++ b/mkspecs/devices/linux-maemo-n9-g++/qmake.conf @@ -3,7 +3,7 @@ # http://wiki.qt-project.org/Devices/N9 MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib QMAKE_PLATFORM = maemo diff --git a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf index bdaaa391e5..e196f279d7 100644 --- a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf +++ b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../../common/linux.conf) diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf index e3a28fb9c4..932b4d7fa7 100644 --- a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf +++ b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf @@ -5,7 +5,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../../common/linux.conf) diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf index f8ba5937c5..8bf2f63b04 100644 --- a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf +++ b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf @@ -5,7 +5,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../../common/linux.conf) diff --git a/mkspecs/devices/linux-snowball-g++/qmake.conf b/mkspecs/devices/linux-snowball-g++/qmake.conf index 0d3a90d524..ebad2bfd27 100644 --- a/mkspecs/devices/linux-snowball-g++/qmake.conf +++ b/mkspecs/devices/linux-snowball-g++/qmake.conf @@ -3,7 +3,7 @@ # http://qt-project.org/wiki/Snowball MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../../common/linux.conf) diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf deleted file mode 100644 index 2b3dee6cc4..0000000000 --- a/mkspecs/features/unix/gdb_dwarf_index.prf +++ /dev/null @@ -1,23 +0,0 @@ -!separate_debug_info:have_target:debug:!static:!isEmpty(QMAKE_OBJCOPY) { - - contains(TEMPLATE, "lib") { - QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } && - QMAKE_GDB_DIR = . - } else { - QMAKE_GDB_INDEX = { test -n \"$(DESTDIR)\" && DESTDIR=\"$(DESTDIR)\" || DESTDIR=.; } && - QMAKE_GDB_DIR = \$\$DESTDIR - } - - QMAKE_GDB_INDEX += \ - test \$\$(gdb --version | sed -e \'s,[^0-9][^0-9]*\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 && \ - gdb --nx --batch --quiet -ex \'set confirm off\' -ex \"save gdb-index $$QMAKE_GDB_DIR\" -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)\' && \ - $$QMAKE_DEL_FILE $(TARGET).gdb-index || true - - !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK - QMAKE_POST_LINK = $$QMAKE_GDB_INDEX $$QMAKE_POST_LINK - - silent:QMAKE_POST_LINK = @echo indexing $@ for gdb && $$QMAKE_POST_LINK -} - diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf index cb6cd3131c..f736e183ec 100644 --- a/mkspecs/freebsd-g++/qmake.conf +++ b/mkspecs/freebsd-g++/qmake.conf @@ -4,7 +4,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = freebsd bsd -CONFIG += gdb_dwarf_index QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/freebsd-g++46/qmake.conf index 8f8e0cd21c..b94b1393e6 100644 --- a/mkspecs/freebsd-g++46/qmake.conf +++ b/mkspecs/freebsd-g++46/qmake.conf @@ -4,7 +4,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = freebsd bsd -CONFIG += gdb_dwarf_index QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf index ef3be3b37b..261695f1ea 100644 --- a/mkspecs/hurd-g++/qmake.conf +++ b/mkspecs/hurd-g++/qmake.conf @@ -4,7 +4,7 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = hurd -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib QMAKE_CFLAGS_THREAD += -D_REENTRANT diff --git a/mkspecs/linux-arm-gnueabi-g++/qmake.conf b/mkspecs/linux-arm-gnueabi-g++/qmake.conf index b2653d8fea..365d5a219b 100644 --- a/mkspecs/linux-arm-gnueabi-g++/qmake.conf +++ b/mkspecs/linux-arm-gnueabi-g++/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../common/linux.conf) diff --git a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf index 56dfe8c1b2..340aa85e7c 100644 --- a/mkspecs/linux-g++-32/qmake.conf +++ b/mkspecs/linux-g++-32/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib QMAKE_CFLAGS = -m32 diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf index fc7672f19d..36fb6a83eb 100644 --- a/mkspecs/linux-g++-64/qmake.conf +++ b/mkspecs/linux-g++-64/qmake.conf @@ -6,7 +6,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib QMAKE_CFLAGS = -m64 diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf index f04a32c750..dc49676456 100644 --- a/mkspecs/linux-g++-maemo/qmake.conf +++ b/mkspecs/linux-g++-maemo/qmake.conf @@ -4,7 +4,7 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = maemo -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental CONFIG += nostrip QMAKE_INCREMENTAL_STYLE = sublib diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf index 0c9634adf8..35bce8f064 100644 --- a/mkspecs/linux-g++/qmake.conf +++ b/mkspecs/linux-g++/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../common/linux.conf) diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index 000632069a..f9a04d2cce 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -3,7 +3,6 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += gdb_dwarf_index QMAKE_COMPILER = gcc intel_icc # icc pretends to be gcc diff --git a/mkspecs/linux-llvm/qmake.conf b/mkspecs/linux-llvm/qmake.conf index 6a9fed64c2..98b18fb373 100644 --- a/mkspecs/linux-llvm/qmake.conf +++ b/mkspecs/linux-llvm/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../common/linux.conf) diff --git a/mkspecs/linux-lsb-g++/qmake.conf b/mkspecs/linux-lsb-g++/qmake.conf index 10a4014d65..80353cd5f6 100644 --- a/mkspecs/linux-lsb-g++/qmake.conf +++ b/mkspecs/linux-lsb-g++/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../common/linux.conf) diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf index 6c699aac53..6cb24d9bf9 100644 --- a/mkspecs/netbsd-g++/qmake.conf +++ b/mkspecs/netbsd-g++/qmake.conf @@ -4,7 +4,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = netbsd bsd -CONFIG += gdb_dwarf_index QMAKE_COMPILER = gcc diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf index f0773e9d0d..2fdbd2c469 100644 --- a/mkspecs/openbsd-g++/qmake.conf +++ b/mkspecs/openbsd-g++/qmake.conf @@ -4,7 +4,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = openbsd bsd -CONFIG += gdb_dwarf_index QMAKE_COMPILER = gcc -- cgit v1.2.3