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>

diff --git a/tests/manual/windowgeometry/controllerwidget.cpp b/tests/manual/windowgeometry/controllerwidget.cpp
index 6014329..e45b057 100644 (file)
--- 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 4450bfd..44ea97b 100644 (file)
--- 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