summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-08-19 11:22:17 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-08-19 11:26:04 +0200
commitcea41dc0934cd68685eca59b2b43e6b7bb59c943 (patch)
tree4b4d967caf0adc3f8a319f0ab994d84129b42beb
parente21f9e3f737dfd278bbb742f14cc354dc92eec1b (diff)
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>
-rw-r--r--src/widgets/kernel/qapplication_p.h2
-rw-r--r--src/widgets/util/qcolormap.h2
-rw-r--r--src/widgets/widgets/qmenu_mac.mm6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index 097e0e521a..ae39037760 100644
--- 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 7ac818fc2e..ebb5142768 100644
--- 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 09c7af7749..5fb364ec1b 100644
--- 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