diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-29 15:41:52 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-08-04 07:12:32 +0200 |
| commit | a00ad951370742241a8c86bc937fc37b13565127 (patch) | |
| tree | 80ed29d7b8a4d4e86d12b721e48d83e53c34cf51 /tests/manual/widgets | |
| parent | 4595fb2c1edce6d2f5e7616111702018d3778001 (diff) | |
Remove last remaining bits of QtPlatformHeaders
Task-number: QTBUG-84220
Change-Id: I951e04bfe9358a99951d1d61ff47b675584b7f81
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'tests/manual/widgets')
3 files changed, 8 insertions, 4 deletions
diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt index 327721ac63..4437ce2fa9 100644 --- a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt @@ -9,7 +9,7 @@ qt_add_manual_test(defaultUpMenuBar SOURCES main.cpp PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/defaultUpMenuBar.pro b/tests/manual/widgets/widgets/defaultUpMenuBar/defaultUpMenuBar.pro index f9cffb3709..6cb197c42f 100644 --- a/tests/manual/widgets/widgets/defaultUpMenuBar/defaultUpMenuBar.pro +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/defaultUpMenuBar.pro @@ -1,4 +1,4 @@ -QT += widgets +QT += widgets gui-private TEMPLATE = app TARGET = defaultUpMenuBar SOURCES += main.cpp diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp b/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp index 602127febe..e9e1d91e37 100644 --- a/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp @@ -54,7 +54,8 @@ // secondary is above it). #include <QtWidgets> -#include <QtPlatformHeaders/QWindowsWindowFunctions> +#include <QtGui/qpa/qplatformwindow.h> +#include <QtGui/qpa/qplatformwindow_p.h> class MainWindow : public QMainWindow { @@ -116,7 +117,10 @@ int main(int argc, char **argv) for (QScreen *screen : QApplication::screens()) { MainWindow *mainWindow = new MainWindow; mainWindow->setGeometry(screen->geometry()); - QWindowsWindowFunctions::setHasBorderInFullScreen(mainWindow->windowHandle(), true); + mainWindow->winId(); + using namespace QPlatformInterface::Private; + if (auto *windowsWindow = dynamic_cast<QWindowsWindow *>(mainWindow->windowHandle()->handle())) + windowsWindow->setHasBorderInFullScreen(true); mainWindow->showMaximized(); } int ret = a.exec(); |