diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-11-06 08:18:05 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-11-06 20:28:47 +0000 |
| commit | 3b125e7aefee18a4d07bfc2fd76a3524c169bf3c (patch) | |
| tree | 26b68a29c16f08bc8120a1edac589e7bc846fedf /ui/qt/qt_ui_utils.cpp | |
| parent | 1799834898dae1c22c8e65746983bc5a031030c3 (diff) | |
Make rect_on_screen Qt4-compatible.
Use QDesktopWidget instead of QGuiApplication + QScreen. The former
exists in the Qt 4 API.
Ping-Bug: 11568
Change-Id: Icfbe9f78659b28efbc86061f94d946f70ab6dc41
Reviewed-on: https://code.wireshark.org/review/11604
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/qt_ui_utils.cpp')
| -rw-r--r-- | ui/qt/qt_ui_utils.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ui/qt/qt_ui_utils.cpp b/ui/qt/qt_ui_utils.cpp index 67bf510b0e..6c3193cf4f 100644 --- a/ui/qt/qt_ui_utils.cpp +++ b/ui/qt/qt_ui_utils.cpp @@ -36,14 +36,14 @@ #include <wsutil/str_util.h> #include <QAction> +#include <QApplication> #include <QDateTime> #include <QDesktopServices> +#include <QDesktopWidget> #include <QDir> #include <QFileInfo> #include <QFontDatabase> -#include <QGuiApplication> #include <QProcess> -#include <QScreen> #include <QUrl> #include <QUuid> @@ -235,8 +235,9 @@ void desktop_show_in_folder(const QString file_path) bool rect_on_screen(const QRect &rect) { - foreach (const QScreen *screen, QGuiApplication::screens()) { - if (screen->availableGeometry().contains(rect)) + QDesktopWidget *desktop = qApp->desktop(); + for (int i = 0; i < desktop->screenCount(); i++) { + if (desktop->availableGeometry(i).contains(rect)) return true; } |