Fix colormap exports/warning in qapplication_p.h

Change-Id: I294e19e7fdf6ab65b5f8ba09d14263487c85b866
Reviewed-on: http://codereview.qt.nokia.com/3256
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index 097e0e5..ae39037 100644 (file)
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@@ -519,7 +519,7 @@ public:
     static HWND getHWNDForWidget(QWidget *widget)
     {
         QWindow *window = widget->windowHandle();
-        return static_cast<HWND> ("handle", QGuiApplication::platformNativeInterface()->nativeResourceForWindow("handle", window));
+        return static_cast<HWND> (QGuiApplication::platformNativeInterface()->nativeResourceForWindow("handle", window));
     }
 #endif
 

diff --git a/src/widgets/util/qcolormap.h b/src/widgets/util/qcolormap.h
index 7ac818f..ebb5142 100644 (file)
--- a/src/widgets/util/qcolormap.h
+++ b/src/widgets/util/qcolormap.h
@@ -56,7 +56,7 @@ QT_MODULE(Gui)
 class QColor;
 class QColormapPrivate;
 
-class Q_GUI_EXPORT QColormap
+class Q_WIDGETS_EXPORT QColormap
 {
 public:
     enum Mode { Direct, Indexed, Gray };

diff --git a/src/widgets/widgets/qmenu_mac.mm b/src/widgets/widgets/qmenu_mac.mm
index 09c7af7..5fb364e 100644 (file)
--- a/src/widgets/widgets/qmenu_mac.mm
+++ b/src/widgets/widgets/qmenu_mac.mm
@@ -454,11 +454,11 @@ static QKeySequence qt_mac_menu_merge_accel(QMacMenuAction *action)
     return ret;
 }
 
-void Q_GUI_EXPORT qt_mac_set_menubar_icons(bool b)
+void Q_WIDGETS_EXPORT qt_mac_set_menubar_icons(bool b)
 { QApplication::instance()->setAttribute(Qt::AA_DontShowIconsInMenus, !b); }
-void Q_GUI_EXPORT qt_mac_set_native_menubar(bool b)
+void Q_WIDGETS_EXPORT qt_mac_set_native_menubar(bool b)
 {  QApplication::instance()->setAttribute(Qt::AA_DontUseNativeMenuBar, !b); }
-void Q_GUI_EXPORT qt_mac_set_menubar_merge(bool b) { qt_mac_no_menubar_merge = !b; }
+void Q_WIDGETS_EXPORT qt_mac_set_menubar_merge(bool b) { qt_mac_no_menubar_merge = !b; }
 
 /*****************************************************************************
   QMenu bindings