diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-23 12:42:11 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-23 17:04:00 +0100 |
commit | 1b8dcec81a0879843f5c3781c3b067ddb6542cbf (patch) | |
tree | 154f6ac3744983e016bdcb0c82b0f5b6e146b7a2 /tests/manual/widgetgrab | |
parent | dae8d2505d6b6c591429768c10ae3ca190679d41 (diff) |
Make widgetgrab manual test compile with 4.8 and 5.
Task-number: QTBUG-27333
Task-number: QTBUG-27550
Change-Id: Iceb2ded9deff1d375bf02b88e214da20901bfa0e
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Diffstat (limited to 'tests/manual/widgetgrab')
-rw-r--r-- | tests/manual/widgetgrab/main.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/tests/manual/widgetgrab/main.cpp b/tests/manual/widgetgrab/main.cpp index a83338e9b7..d842876faf 100644 --- a/tests/manual/widgetgrab/main.cpp +++ b/tests/manual/widgetgrab/main.cpp @@ -57,6 +57,8 @@ #include <QTimer> #include <QLineEdit> +// Compiles with Qt 4.8 and Qt 5. + class MainWindow : public QMainWindow { Q_OBJECT @@ -233,11 +235,15 @@ bool MainWindow::eventFilter(QObject *o, QEvent *e) if (o->isWidgetType()) { switch (e->type()) { case QEvent::Enter: { - const QEnterEvent *ee = static_cast<QEnterEvent *>(e); QString message; QDebug debug(&message); +#if QT_VERSION >= 0x050000 + const QEnterEvent *ee = static_cast<QEnterEvent *>(e); debug.nospace() << '#' << m_enterLeaveEventCount++ << " Enter for " << o->objectName() << " at " << ee->localPos() << " global: " << ee->globalPos(); +#else + debug.nospace() << '#' << m_enterLeaveEventCount++ << " Enter for " << o->objectName(); +#endif m_logEdit->appendPlainText(message); } break; @@ -363,8 +369,13 @@ void MainWindow::grabKeyboardWindowToggled(bool g) void MainWindow::forceNativeWidgets() { - m_logEdit->appendPlainText(QString::fromLatin1("Created native widget %1"). - arg(m_forceNativeButton->winId())); + const WId platformWid = m_forceNativeButton->winId(); +#if QT_VERSION < 0x050000 && defined(Q_OS_WIN) + const quintptr wid = quintptr(platformWid); // HWND on Qt 4.8/Windows. +#else + const WId wid = platformWid; +#endif + m_logEdit->appendPlainText(QString::fromLatin1("Created native widget %1").arg(wid)); m_forceNativeButton->setEnabled(false); m_forceNativeButton->setText(QLatin1String("Native widgets created")); } |