build fix for the case when QT_NO_SIZEGRIP is defined

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/styles/qstyleoption.h b/src/gui/styles/qstyleoption.h
index 1052bd3..2763a42 100644 (file)
--- a/src/gui/styles/qstyleoption.h
+++ b/src/gui/styles/qstyleoption.h
@@ -598,6 +598,7 @@ protected:
     QStyleOptionGroupBox(int version);
 };
 
+#ifndef QT_NO_SIZEGRIP
 class Q_GUI_EXPORT QStyleOptionSizeGrip : public QStyleOptionComplex
 {
 public:
@@ -611,6 +612,7 @@ public:
 protected:
     QStyleOptionSizeGrip(int version);
 };
+#endif // QT_NO_SIZEGRIP
 
 class Q_GUI_EXPORT QStyleOptionGraphicsItem : public QStyleOption
 {

diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index 7377b99..7c990b7 100644 (file)
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -3826,6 +3826,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
         }
         break;
 
+#ifndef QT_NO_SIZEGRIP
     case CE_SizeGrip:
         if (const QStyleOptionSizeGrip *sgOpt = qstyleoption_cast<const QStyleOptionSizeGrip *>(opt)) {
             if (rule.hasDrawable()) {
@@ -3848,6 +3849,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
             return;
         }
         break;
+#endif // QT_NO_SIZEGRIP
 
     case CE_ToolBoxTab:
         QWindowsStyle::drawControl(ce, opt, p, w);

diff --git a/tests/auto/qdialog/tst_qdialog.cpp b/tests/auto/qdialog/tst_qdialog.cpp
index 1d2b650..28fb1da 100644 (file)
--- a/tests/auto/qdialog/tst_qdialog.cpp
+++ b/tests/auto/qdialog/tst_qdialog.cpp
@@ -161,6 +161,7 @@ void tst_QDialog::defaultButtons()
 
 void tst_QDialog::showMaximized()
 {
+#ifndef QT_NO_SIZEGRIP
     QDialog dialog(0);
     dialog.setSizeGripEnabled(true);
     QSizeGrip *sizeGrip = dialog.findChild<QSizeGrip *>();
@@ -195,6 +196,9 @@ void tst_QDialog::showMaximized()
     dialog.showMaximized();
     QVERIFY(dialog.isMaximized());
     QVERIFY(dialog.isVisible());
+#else // QT_NO_SIZEGRIP
+    QSKIP("Katie compiled without sizegrip support (QT_NO_SIZEGRIP)", SkipAll);
+#endif // QT_NO_SIZEGRIP
 }
 
 void tst_QDialog::showMinimized()
@@ -232,6 +236,7 @@ void tst_QDialog::showMinimized()
 
 void tst_QDialog::showFullScreen()
 {
+#ifndef QT_NO_SIZEGRIP
     QDialog dialog(0, Qt::X11BypassWindowManagerHint);
     dialog.setSizeGripEnabled(true);
     QSizeGrip *sizeGrip = dialog.findChild<QSizeGrip *>();
@@ -278,12 +283,15 @@ void tst_QDialog::showFullScreen()
     dialog.hide();
     QVERIFY(dialog.isFullScreen());
     QVERIFY(!dialog.isVisible());
+#else // QT_NO_SIZEGRIP
+    QSKIP("Katie compiled without sizegrip support (QT_NO_SIZEGRIP)", SkipAll);
+#endif // QT_NO_SIZEGRIP
 }
 
 void tst_QDialog::showAsTool()
 {
 #if defined(Q_WS_X11)
-    QSKIP("Qt/X11: Skipped since activeWindow() is not respected by all window managers", SkipAll);
+    QSKIP("Katie/X11: Skipped since activeWindow() is not respected by all window managers", SkipAll);
 #endif
     ToolDialog dialog(testWidget);
     testWidget->activateWindow();
@@ -395,7 +403,9 @@ void tst_QDialog::showSizeGrip()
     dialog.hide();
     dialog.show();
     QVERIFY(!sizeGrip->isVisible());
-#endif
+#else // QT_NO_SIZEGRIP
+    QSKIP("Katie compiled without sizegrip support (QT_NO_SIZEGRIP)", SkipAll);
+#endif // QT_NO_SIZEGRIP
 }
 
 void tst_QDialog::setVisible()

diff --git a/tests/auto/qsizegrip/tst_qsizegrip.cpp b/tests/auto/qsizegrip/tst_qsizegrip.cpp
index a07421d..0514c42 100644 (file)
--- a/tests/auto/qsizegrip/tst_qsizegrip.cpp
+++ b/tests/auto/qsizegrip/tst_qsizegrip.cpp
@@ -27,6 +27,10 @@
 #include <QVBoxLayout>
 #include <QLabel>
 
+// TESTED_CLASS=
+// TESTED_FILES=
+
+#ifndef QT_NO_SIZEGRIP
 static inline Qt::Corner sizeGripCorner(QWidget *parent, QSizeGrip *sizeGrip)
 {
     if (!parent || !sizeGrip)
@@ -42,9 +46,6 @@ static inline Qt::Corner sizeGripCorner(QWidget *parent, QSizeGrip *sizeGrip)
 
 }
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(Qt::WindowType);
 
 class tst_QSizeGrip : public QObject
@@ -176,3 +177,8 @@ QTEST_MAIN(tst_QSizeGrip)
 
 #include "moc_tst_qsizegrip.cpp"
 
+#else // QT_NO_SIZEGRIP
+
+QTEST_NOOP_MAIN
+
+#endif // QT_NO_SIZEGRIP

diff --git a/tests/auto/qstatusbar/tst_qstatusbar.cpp b/tests/auto/qstatusbar/tst_qstatusbar.cpp
index 763eaf3..3f31a4f 100644 (file)
--- a/tests/auto/qstatusbar/tst_qstatusbar.cpp
+++ b/tests/auto/qstatusbar/tst_qstatusbar.cpp
@@ -153,6 +153,7 @@ void tst_QStatusBar::insertPermanentWidget()
 
 void tst_QStatusBar::setSizeGripEnabled()
 {
+#ifndef QT_NO_SIZEGRIP
     QMainWindow mainWindow;
     QPointer<QStatusBar> statusBar = mainWindow.statusBar();
     QVERIFY(statusBar);
@@ -209,6 +210,9 @@ void tst_QStatusBar::setSizeGripEnabled()
     mainWindow.showNormal();
     qApp->processEvents();
     QTRY_VERIFY(sizeGrip->isVisible());
+#else // QT_NO_SIZEGRIP
+    QSKIP("Katie compiled without sizegrip support (QT_NO_SIZEGRIP)", SkipAll);
+#endif // QT_NO_SIZEGRIP
 }
 
 void tst_QStatusBar::task194017_hiddenWidget()
@@ -241,6 +245,7 @@ void tst_QStatusBar::task194017_hiddenWidget()
 
 void tst_QStatusBar::QTBUG4334_hiddenOnMaximizedWindow()
 {
+#ifndef QT_NO_SIZEGRIP
     QMainWindow main;
     QStatusBar statusbar;
     statusbar.setSizeGripEnabled(true);
@@ -254,6 +259,9 @@ void tst_QStatusBar::QTBUG4334_hiddenOnMaximizedWindow()
     main.showFullScreen();
     QTest::qWaitForWindowShown(&main);
     QVERIFY(!statusbar.findChild<QSizeGrip*>()->isVisible());
+#else // QT_NO_SIZEGRIP
+    QSKIP("Katie compiled without sizegrip support (QT_NO_SIZEGRIP)", SkipAll);
+#endif // QT_NO_SIZEGRIP
 }
 
 void tst_QStatusBar::QTBUG25492_msgtimeout()

diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp
index 61281b1..8259aa4 100644 (file)
--- a/tests/auto/qstyle/tst_qstyle.cpp
+++ b/tests/auto/qstyle/tst_qstyle.cpp
@@ -229,8 +229,10 @@ void tst_QStyle::testAllFunctions(QStyle *style)
 
         QStyleOptionGroupBox copt2;
         copt2.init(testWidget);
+#ifndef QT_NO_SIZEGRIP
         QStyleOptionSizeGrip copt3;
         copt3.init(testWidget);
+#endif // QT_NO_SIZEGRIP
         QStyleOptionSlider copt4;
         copt4.init(testWidget);
         copt4.minimum = 0;