diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-24 10:21:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-24 10:44:29 +0200 |
| commit | 41ea15f83dd21396ab0c4b86b8962ead2e179d4f (patch) | |
| tree | 60f6514f2e0b452e600610bc9dbce64cc3221e1b | |
| parent | fb449f426e7311af4119a47a6095fa4c495ea4ec (diff) | |
Fix windowgeometry test for Windows.
- Specify main.cpp with full path to avoid obscure link
errors (grabbing main.cpp from windowflags)
- Set proper flags on the test window.
Change-Id: I9bbaf9cb5c7e210f53a51b58bd48a827d6104fe2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rw-r--r-- | tests/manual/windowgeometry/controllerwidget.cpp | 3 | ||||
| -rw-r--r-- | tests/manual/windowgeometry/windowgeometry.pro | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/manual/windowgeometry/controllerwidget.cpp b/tests/manual/windowgeometry/controllerwidget.cpp index 601432916a..e45b05776d 100644 --- a/tests/manual/windowgeometry/controllerwidget.cpp +++ b/tests/manual/windowgeometry/controllerwidget.cpp @@ -441,6 +441,9 @@ ControllerWidget::ControllerWidget(QWidget *parent) #if QT_VERSION >= 0x050000 x += 300; + m_testWindow->setWindowFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint + | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint + | Qt::WindowTitleHint); m_testWindow->setFramePos(QPoint(x, y)); m_testWindow->resize(200, 200); m_testWindow->show(); diff --git a/tests/manual/windowgeometry/windowgeometry.pro b/tests/manual/windowgeometry/windowgeometry.pro index 4450bfd588..44ea97ba62 100644 --- a/tests/manual/windowgeometry/windowgeometry.pro +++ b/tests/manual/windowgeometry/windowgeometry.pro @@ -3,7 +3,7 @@ TARGET = windowgeometry TEMPLATE = app INCLUDEPATH += ../windowflags -SOURCES += main.cpp controllerwidget.cpp ../windowflags/controls.cpp +SOURCES += $$PWD/main.cpp controllerwidget.cpp ../windowflags/controls.cpp HEADERS += controllerwidget.h ../windowflags/controls.h greaterThan(QT_MAJOR_VERSION, 4): QT += widgets |