diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 09:32:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 09:42:25 +0100 |
| commit | fc35f714340d5361231506dfbead132122f59460 (patch) | |
| tree | fd80498d9417c87b386a011f5849f1e4e48ad3fa /tests/manual/diaglib | |
| parent | 6389160f04322449c34bd1ecfe53983e3b588943 (diff) | |
| parent | 0d990b9ca117514fe83f53b39f25d6272304f2fb (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
src/gui/image/qimage_conversions.cpp
src/gui/opengl/qopenglextensions_p.h
src/gui/text/qtextengine.cpp
src/network/ssl/qsslsocket_openssl.cpp
src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
src/plugins/platforms/eglfs/qeglfsscreen.cpp
src/plugins/platforms/eglfs/qeglfswindow.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
src/plugins/platforms/windows/qwindowsnativeinterface.cpp
src/plugins/platforms/windows/qwindowsscreen.cpp
src/plugins/platforms/windows/qwindowswindow.cpp
src/plugins/platforms/windows/qwindowswindow.h
src/plugins/platforms/xcb/qxcbdrag.h
src/widgets/itemviews/qabstractitemview.cpp
src/widgets/kernel/qwidget.cpp
src/widgets/util/qsystemtrayicon_p.h
tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp
conflicts.
Change-Id: I937232c30523d5121c195d947d92aec6f129b03e
Diffstat (limited to 'tests/manual/diaglib')
| -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 69ba17a5d0..0fbba08a21 100644 --- a/tests/manual/diaglib/nativewindowdump_win.cpp +++ b/tests/manual/diaglib/nativewindowdump_win.cpp @@ -170,7 +170,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 |