diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-01-22 16:53:16 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-01-23 09:45:59 +0100 |
| commit | cebd6d59cb52bad59e4056691c8eb04690858897 (patch) | |
| tree | 0a48a0cd3168ccc6fa4b9f2807728439e2957788 | |
| parent | 560c8ac09865caa93228da8c343a93dce6ba01d2 (diff) | |
Diaglib: Fix compilation with Qt 5.3.
QDebug does not have noquote() in Qt 5.3.
Task-number: QTBUG-44021
Change-Id: If35b926d6b1e5bb9ad3534357630533dfcecd076
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| -rw-r--r-- | tests/manual/diaglib/nativewindowdump_win.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/diaglib/qwidgetdump.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/diaglib/qwindowdump.cpp | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/tests/manual/diaglib/nativewindowdump_win.cpp b/tests/manual/diaglib/nativewindowdump_win.cpp index 814b580f4b..a8e715583d 100644 --- a/tests/manual/diaglib/nativewindowdump_win.cpp +++ b/tests/manual/diaglib/nativewindowdump_win.cpp @@ -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)); diff --git a/tests/manual/diaglib/qwidgetdump.cpp b/tests/manual/diaglib/qwidgetdump.cpp index d4f985c7c8..894f51bce3 100644 --- a/tests/manual/diaglib/qwidgetdump.cpp +++ b/tests/manual/diaglib/qwidgetdump.cpp @@ -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)); diff --git a/tests/manual/diaglib/qwindowdump.cpp b/tests/manual/diaglib/qwindowdump.cpp index 2ecc52ca77..228472cd44 100644 --- a/tests/manual/diaglib/qwindowdump.cpp +++ b/tests/manual/diaglib/qwindowdump.cpp @@ -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 |