diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-09-04 12:40:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 06:24:38 +0200 |
| commit | 34cd8fd566cd61385db12112d9515b0d5388dad3 (patch) | |
| tree | 0f311e165c03c040f2c32261f96d80965443d4c6 /tests/auto/widgets/widgets/qmainwindow | |
| parent | 6fd1895b918c45d8404ff38319f508f0357cba27 (diff) | |
tests: Don't omit the body of a test function with QT_BUILD_INTERNAL
Changing it outside of the test function definition to avoid running
empty/inapplicable test functions.
Change-Id: I713560cde7f715696984ed082d682900f5f1bcdd
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Diffstat (limited to 'tests/auto/widgets/widgets/qmainwindow')
| -rw-r--r-- | tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index 23c3f78e53..2d14837f1b 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -115,7 +115,6 @@ private slots: void iconSize(); void toolButtonStyle(); void menuBar(); - void statusBar(); void centralWidget(); void corner(); void addToolBarBreak(); @@ -132,8 +131,11 @@ private slots: void restoreStateFromPreviousVersion(); void createPopupMenu(); void hideBeforeLayout(); +#ifdef QT_BUILD_INTERNAL void saveRestore(); void saveRestore_data(); + void statusBar(); +#endif void isSeparator(); #ifndef QT_NO_CURSOR void setCursor(); @@ -653,6 +655,7 @@ void tst_QMainWindow::menuBar() } } +#ifdef QT_BUILD_INTERNAL void tst_QMainWindow::statusBar() { { @@ -734,6 +737,7 @@ void tst_QMainWindow::statusBar() QVERIFY(indexOfSb == -1); } } +#endif void tst_QMainWindow::centralWidget() { @@ -1510,9 +1514,9 @@ QMap<QString, QRect> dockWidgetGeometries(QMainWindow *mw) QCOMPARE(__newGeos, __oldGeos); \ } +#ifdef QT_BUILD_INTERNAL void tst_QMainWindow::saveRestore_data() { -#ifdef QT_BUILD_INTERNAL QTest::addColumn<AddList >("addList"); QTest::addColumn<MoveList >("moveList"); @@ -1547,12 +1551,12 @@ void tst_QMainWindow::saveRestore_data() << MoveSeparator(-30, "right1") << MoveSeparator(30, "right2a") ); -#endif } +#endif +#ifdef QT_BUILD_INTERNAL void tst_QMainWindow::saveRestore() { -#ifdef QT_BUILD_INTERNAL QFETCH(AddList, addList); QFETCH(MoveList, moveList); @@ -1613,8 +1617,8 @@ void tst_QMainWindow::saveRestore() mainWindow.show(); COMPARE_DOCK_WIDGET_GEOS(dockWidgetGeos, dockWidgetGeometries(&mainWindow)); } -#endif } +#endif void tst_QMainWindow::isSeparator() { |