1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Diaglib: Fix compilation with Qt 5.3.

Browse Source 
QDebug does not have noquote() in Qt 5.3.

Task-number: QTBUG-44021
Change-Id: If35b926d6b1e5bb9ad3534357630533dfcecd076
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-01-22 16:53:16 +01:00
parent 560c8ac098
commit cebd6d59cb
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/manual/diaglib/nativewindowdump_win.cpp
View File

@ -166,7 +166,7 @@ static void dumpNativeWindows(const WIdVector& wins)
dc.stream = QSharedPointer<QTextStream>(new QTextStream(&s));
foreach (WId win, wins)
dumpNativeWindowRecursion(reinterpret_cast<HWND>(win), &dc);
#if QT_VERSION > 0x050000
#if QT_VERSION >= 0x050400
qDebug().noquote() << s;
#else
qDebug("%s", qPrintable(s));

2
tests/manual/diaglib/qwidgetdump.cpp
View File

@ -84,7 +84,7 @@ void dumpAllWidgets(FormatWindowOptions options)
str << "### QWidgets:\n";
foreach (QWidget *tw, QApplication::topLevelWidgets())
dumpWidgetRecursion(str, tw, options);
#if QT_VERSION > 0x050000
#if QT_VERSION >= 0x050400
qDebug().noquote() << d;
#else
qDebug("%s", qPrintable(d));

4
tests/manual/diaglib/qwindowdump.cpp
View File

@ -157,7 +157,11 @@ void dumpAllWindows(FormatWindowOptions options)
str << "### QWindows:\n";
foreach (QWindow *w, QGuiApplication::topLevelWindows())
dumpWindowRecursion(str, w, options);
#if QT_VERSION >= 0x050400
qDebug().noquote() << d;
#else
qDebug() << d;
#endif
}
#else // Qt 5