whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Friedemann Kleint 2011-08-19 11:22:17 +02:00
parent e21f9e3f73
commit cea41dc093
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/kernel/qapplication_p.h
View File

@ -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

2
src/widgets/util/qcolormap.h
View File

@ -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 };

6
src/widgets/widgets/qmenu_mac.mm
View File

@ -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