diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-12 14:38:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 06:23:27 +0100 |
| commit | 74494ea29ebc6e152348ed6a6c1e2c9399ddb204 (patch) | |
| tree | a2e32e5c4202758a5f6b3fbbd985666735f47372 /tests/manual/windowgeometry | |
| parent | 3372b0faa74114184afbfde20a3bc27049df2c94 (diff) | |
Fix building of the manual tests.
Adapt to API-changes, exclude network/SSL-tests for Windows.
Change-Id: I80d5ef1bd81e149a2f04fa7644376a8a88b1f7b9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'tests/manual/windowgeometry')
| -rw-r--r-- | tests/manual/windowgeometry/controllerwidget.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/manual/windowgeometry/controllerwidget.cpp b/tests/manual/windowgeometry/controllerwidget.cpp index 8340b90654..d8c74ef8a3 100644 --- a/tests/manual/windowgeometry/controllerwidget.cpp +++ b/tests/manual/windowgeometry/controllerwidget.cpp @@ -311,7 +311,7 @@ public: , m_backingStore(new QBackingStore(this)) { setObjectName(QStringLiteral("window")); - setWindowTitle(tr("TestWindow")); + setTitle(tr("TestWindow")); } protected: @@ -363,9 +363,9 @@ private: virtual QPoint objectMapToGlobal(const QObject *o, const QPoint &p) const { return static_cast<const QWindow *>(o)->mapToGlobal(p); } virtual Qt::WindowFlags objectWindowFlags(const QObject *o) const - { return static_cast<const QWindow *>(o)->windowFlags(); } + { return static_cast<const QWindow *>(o)->flags(); } virtual void setObjectWindowFlags(QObject *o, Qt::WindowFlags f) - { static_cast<QWindow *>(o)->setWindowFlags(f); } + { static_cast<QWindow *>(o)->setFlags(f); } WindowStateControl *m_stateControl; }; @@ -374,7 +374,7 @@ WindowControl::WindowControl(QWindow *w ) : BaseWindowControl(w) , m_stateControl(new WindowStateControl(WindowStateControl::WantVisibleCheckBox | WindowStateControl::WantMinimizeRadioButton)) { - setTitle(w->windowTitle()); + setTitle(w->title()); QGroupBox *stateGroupBox = new QGroupBox(tr("State")); QVBoxLayout *l = new QVBoxLayout(stateGroupBox); l->addWidget(m_stateControl); @@ -454,7 +454,7 @@ ControllerWidget::ControllerWidget(QWidget *parent) #if QT_VERSION >= 0x050000 x += 300; - m_testWindow->setWindowFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint + m_testWindow->setFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowTitleHint | Qt::WindowFullscreenButtonHint); m_testWindow->setFramePosition(QPoint(x, y)); @@ -467,7 +467,7 @@ ControllerWidget::ControllerWidget(QWidget *parent) m_testWindow->showFullScreen(); else m_testWindow->show(); - m_testWindow->setWindowTitle(tr("TestWindow")); + m_testWindow->setTitle(tr("TestWindow")); #endif QWidget *central = new QWidget ; |