build fix for the case when QT_NO_CALENDARWIDGET or QT_NO_DATETIMEEDIT is defined

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

diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake
index c83aeac..ddbbc97 100644 (file)
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -87,7 +87,6 @@
 // #cmakedefine QT_NO_ACTION
 // #cmakedefine QT_NO_ANIMATION
 // #cmakedefine QT_NO_BUTTONGROUP
-// #cmakedefine QT_NO_CALENDARWIDGET
 // #cmakedefine QT_NO_CLIPBOARD
 // #cmakedefine QT_NO_DRAGANDDROP
 // #cmakedefine QT_NO_COLORDIALOG
@@ -96,7 +95,6 @@
 // #cmakedefine QT_NO_CONTEXTMENU
 // #cmakedefine QT_NO_CSSPARSER
 // #cmakedefine QT_NO_DATESTRING
-// #cmakedefine QT_NO_DATETIMEEDIT
 // #cmakedefine QT_NO_DEBUG_STREAM
 // #cmakedefine QT_NO_DIRMODEL
 // #cmakedefine QT_NO_DOCKWIDGET
@@ -166,10 +164,12 @@
 
 // Misc
 #cmakedefine QT_NO_BACKINGSTORE
+#cmakedefine QT_NO_CALENDARWIDGET
 #cmakedefine QT_NO_COLORNAMES
 #cmakedefine QT_NO_COLUMNVIEW
 #cmakedefine QT_NO_CURSOR
 #cmakedefine QT_NO_DATAWIDGETMAPPER
+#cmakedefine QT_NO_DATETIMEEDIT
 #cmakedefine QT_NO_DEBUG
 #cmakedefine QT_NO_DIAL
 #cmakedefine QT_NO_DIALOGBUTTONBOX

diff --git a/src/uitools/widgets.table b/src/uitools/widgets.table
index c073e96..198478e 100644 (file)
--- a/src/uitools/widgets.table
+++ b/src/uitools/widgets.table
@@ -13,11 +13,7 @@ DECLARE_WIDGET(QComboBox, "")
 #endif
 #ifndef QT_NO_DATETIMEEDIT
 DECLARE_WIDGET(QDateTimeEdit, "")
-#endif
-#ifndef QT_NO_DATEEDIT
 DECLARE_WIDGET(QDateEdit, "")
-#endif
-#ifndef QT_NO_TIMEEDIT
 DECLARE_WIDGET(QTimeEdit, "")
 #endif
 #ifndef QT_NO_DIAL

diff --git a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
index d7aee80..ba00f0f 100644 (file)
--- a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
+++ b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
@@ -30,10 +30,10 @@
 #include <qdatetime.h>
 #include <qtextformat.h>
 
-
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#ifndef QT_NO_CALENDARWIDGET
 class tst_QCalendarWidget : public QObject
 {
     Q_OBJECT
@@ -315,3 +315,9 @@ void tst_QCalendarWidget::showPrevNext()
 QTEST_MAIN(tst_QCalendarWidget)
 
 #include "moc_tst_qcalendarwidget.cpp"
+
+#else // QT_NO_CALENDARWIDGET
+
+QTEST_NOOP_MAIN
+
+#endif // QT_NO_CALENDARWIDGET

diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
index c1da685..1179de0 100644 (file)
--- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -1239,7 +1239,9 @@ void tst_QStyleSheetStyle::emptyStyleSheet()
     layout.addWidget(new QLineEdit(&w));
     layout.addWidget(new QSpinBox(&w));
     layout.addWidget(new QComboBox(&w));
+#ifndef QT_NO_DATETIMEEDIT
     layout.addWidget(new QDateEdit(&w));
+#endif
     layout.addWidget(new QGroupBox("some text", &w));
 
     w.show();