partial build fix for the case when QT_NO_TOOLBAR 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 b2659d7..e6e752b 100644 (file)
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -149,6 +149,8 @@
 // #cmakedefine QT_NO_TEXTCONTROL
 // #cmakedefine QT_NO_TEXTEDIT
 // #cmakedefine QT_NO_TEXTHTMLPARSER
+// #cmakedefine QT_NO_TEXTDATE
+// #cmakedefine QT_NO_TOOLBAR
 
 // Misc
 #cmakedefine QT_NO_USING_NAMESPACE
@@ -201,8 +203,6 @@
 #cmakedefine QT_NO_SYSTEMSEMAPHORE
 #cmakedefine QT_NO_SYSTEMTRAYICON
 #cmakedefine QT_NO_TEXTBROWSER
-#cmakedefine QT_NO_TEXTDATE
-#cmakedefine QT_NO_TOOLBAR
 #cmakedefine QT_NO_TOOLBOX
 #cmakedefine QT_NO_TOOLBUTTON
 #cmakedefine QT_NO_TOOLTIP

diff --git a/src/gui/widgets/qtoolbar_p.h b/src/gui/widgets/qtoolbar_p.h
index 850d029..d72d6e3 100644 (file)
--- a/src/gui/widgets/qtoolbar_p.h
+++ b/src/gui/widgets/qtoolbar_p.h
@@ -38,10 +38,10 @@
 #include "qwidget_p.h"
 #include <QtCore/qbasictimer.h>
 
-QT_BEGIN_NAMESPACE
-
 #ifndef QT_NO_TOOLBAR
 
+QT_BEGIN_NAMESPACE
+
 class QToolBarLayout;
 class QTimer;
 
@@ -100,8 +100,8 @@ public:
     QBasicTimer waitForPopupTimer;
 };
 
-#endif // QT_NO_TOOLBAR
-
 QT_END_NAMESPACE
 
+#endif // QT_NO_TOOLBAR
+
 #endif // QDYNAMICTOOLBAR_P_H

diff --git a/src/gui/widgets/qtoolbararealayout_p.h b/src/gui/widgets/qtoolbararealayout_p.h
index 2c40693..b343c11 100644 (file)
--- a/src/gui/widgets/qtoolbararealayout_p.h
+++ b/src/gui/widgets/qtoolbararealayout_p.h
@@ -222,7 +222,8 @@ public:
     bool isEmpty() const;
 };
 
+#endif // QT_NO_TOOLBAR
 
 QT_END_NAMESPACE
-#endif // QT_NO_TOOLBAR
+
 #endif // QTOOLBARAREALAYOUT_P_H