summaryrefslogtreecommitdiffstats
path: root/src/widgets/platforms
diff options
context:
space:
mode:
authorOlli Werwolff <qt-info@nokia.com>2011-06-08 09:51:07 +0200
committerOlli Werwolff <qt-info@nokia.com>2011-06-08 10:43:55 +0200
commit819f9ca965279562f34895dab405f28162c0b8ab (patch)
tree8e129b6846ec1762c5d33c4788be58abb29ad95b /src/widgets/platforms
parent6a243e555901b4345fec83b064ff378863f2d147 (diff)
Use Q_WIDGETS_EXPORT for widgets library
Reviewed-by: Lars Knoll
Diffstat (limited to 'src/widgets/platforms')
-rw-r--r--src/widgets/platforms/mac/qcocoaview_mac_p.h2
-rw-r--r--src/widgets/platforms/mac/qkeymapper_mac.cpp2
-rw-r--r--src/widgets/platforms/mac/qmime_mac.cpp2
-rw-r--r--src/widgets/platforms/mac/qpaintdevice_mac.cpp4
-rw-r--r--src/widgets/platforms/mac/qpixmap_mac.cpp4
-rw-r--r--src/widgets/platforms/mac/qregion_mac.cpp6
-rw-r--r--src/widgets/platforms/mac/qt_mac_p.h4
-rw-r--r--src/widgets/platforms/s60/qeventdispatcher_s60_p.h2
-rw-r--r--src/widgets/platforms/win/qapplication_win.cpp12
-rw-r--r--src/widgets/platforms/win/qkeymapper_win.cpp2
-rw-r--r--src/widgets/platforms/x11/qapplication_x11.cpp12
-rw-r--r--src/widgets/platforms/x11/qfont_x11.cpp2
-rw-r--r--src/widgets/platforms/x11/qfontengine_x11.cpp2
-rw-r--r--src/widgets/platforms/x11/qfontengine_x11_p.h4
-rw-r--r--src/widgets/platforms/x11/qpaintdevice_x11.cpp4
-rw-r--r--src/widgets/platforms/x11/qpaintengine_x11.cpp8
-rw-r--r--src/widgets/platforms/x11/qpaintengine_x11_p.h4
-rw-r--r--src/widgets/platforms/x11/qpixmap_x11.cpp2
-rw-r--r--src/widgets/platforms/x11/qpixmap_x11_p.h2
-rw-r--r--src/widgets/platforms/x11/qt_x11_p.h2
-rw-r--r--src/widgets/platforms/x11/qwidget_x11.cpp4
-rw-r--r--src/widgets/platforms/x11/qx11embed_x11.h4
-rw-r--r--src/widgets/platforms/x11/qx11info_x11.h2
23 files changed, 46 insertions, 46 deletions
diff --git a/src/widgets/platforms/mac/qcocoaview_mac_p.h b/src/widgets/platforms/mac/qcocoaview_mac_p.h
index e5e977bedd..963cbe06bf 100644
--- a/src/widgets/platforms/mac/qcocoaview_mac_p.h
+++ b/src/widgets/platforms/mac/qcocoaview_mac_p.h
@@ -61,7 +61,7 @@ QT_FORWARD_DECLARE_CLASS(QEvent);
QT_FORWARD_DECLARE_CLASS(QString);
QT_FORWARD_DECLARE_CLASS(QStringList);
-Q_GUI_EXPORT
+Q_WIDGETS_EXPORT
@interface QT_MANGLE_NAMESPACE(QCocoaView) : NSControl <NSTextInput> {
QWidget *qwidget;
QWidgetPrivate *qwidgetprivate;
diff --git a/src/widgets/platforms/mac/qkeymapper_mac.cpp b/src/widgets/platforms/mac/qkeymapper_mac.cpp
index b5b3c4b5b9..e96caf1b9d 100644
--- a/src/widgets/platforms/mac/qkeymapper_mac.cpp
+++ b/src/widgets/platforms/mac/qkeymapper_mac.cpp
@@ -67,7 +67,7 @@ QT_USE_NAMESPACE
bool qt_mac_eat_unicode_key = false;
extern bool qt_sendSpontaneousEvent(QObject *obj, QEvent *event); //qapplication_mac.cpp
-Q_GUI_EXPORT void qt_mac_secure_keyboard(bool b)
+Q_WIDGETS_EXPORT void qt_mac_secure_keyboard(bool b)
{
static bool secure = false;
if (b != secure){
diff --git a/src/widgets/platforms/mac/qmime_mac.cpp b/src/widgets/platforms/mac/qmime_mac.cpp
index a1df34eb1f..0eaaaa8f2a 100644
--- a/src/widgets/platforms/mac/qmime_mac.cpp
+++ b/src/widgets/platforms/mac/qmime_mac.cpp
@@ -103,7 +103,7 @@ Q_GLOBAL_STATIC(QStringList, globalDraggedTypesList)
\sa QMacPasteboardMime
*/
-Q_GUI_EXPORT void qRegisterDraggedTypes(const QStringList &types)
+Q_WIDGETS_EXPORT void qRegisterDraggedTypes(const QStringList &types)
{
(*globalDraggedTypesList()) += types;
}
diff --git a/src/widgets/platforms/mac/qpaintdevice_mac.cpp b/src/widgets/platforms/mac/qpaintdevice_mac.cpp
index 56cf8dc5a8..d29047bf50 100644
--- a/src/widgets/platforms/mac/qpaintdevice_mac.cpp
+++ b/src/widgets/platforms/mac/qpaintdevice_mac.cpp
@@ -85,7 +85,7 @@ float qt_mac_defaultDpi_y()
\warning This function is only available on Mac OS X.
*/
-Q_GUI_EXPORT GrafPtr qt_mac_qd_context(const QPaintDevice *device)
+Q_WIDGETS_EXPORT GrafPtr qt_mac_qd_context(const QPaintDevice *device)
{
if (device->devType() == QInternal::Pixmap) {
return static_cast<GrafPtr>(static_cast<const QPixmap *>(device)->macQDHandle());
@@ -109,7 +109,7 @@ extern CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice *pdev);
\warning This function is only available on Mac OS X.
*/
-Q_GUI_EXPORT CGContextRef qt_mac_cg_context(const QPaintDevice *pdev)
+Q_WIDGETS_EXPORT CGContextRef qt_mac_cg_context(const QPaintDevice *pdev)
{
if (pdev->devType() == QInternal::Pixmap) {
const QPixmap *pm = static_cast<const QPixmap*>(pdev);
diff --git a/src/widgets/platforms/mac/qpixmap_mac.cpp b/src/widgets/platforms/mac/qpixmap_mac.cpp
index cb3016177d..da08878427 100644
--- a/src/widgets/platforms/mac/qpixmap_mac.cpp
+++ b/src/widgets/platforms/mac/qpixmap_mac.cpp
@@ -72,7 +72,7 @@ extern QRegion qt_mac_convert_mac_region(RgnHandle rgn); //qregion_mac.cpp
static int qt_pixmap_serial = 0;
-Q_GUI_EXPORT quint32 *qt_mac_pixmap_get_base(const QPixmap *pix)
+Q_WIDGETS_EXPORT quint32 *qt_mac_pixmap_get_base(const QPixmap *pix)
{
if (QApplicationPrivate::graphics_system_name == QLatin1String("raster"))
return reinterpret_cast<quint32 *>(static_cast<QRasterPixmapData*>(pix->data.data())->buffer()->bits());
@@ -80,7 +80,7 @@ Q_GUI_EXPORT quint32 *qt_mac_pixmap_get_base(const QPixmap *pix)
return static_cast<QMacPixmapData*>(pix->data.data())->pixels;
}
-Q_GUI_EXPORT int qt_mac_pixmap_get_bytes_per_line(const QPixmap *pix)
+Q_WIDGETS_EXPORT int qt_mac_pixmap_get_bytes_per_line(const QPixmap *pix)
{
if (QApplicationPrivate::graphics_system_name == QLatin1String("raster"))
return static_cast<QRasterPixmapData*>(pix->data.data())->buffer()->bytesPerLine();
diff --git a/src/widgets/platforms/mac/qregion_mac.cpp b/src/widgets/platforms/mac/qregion_mac.cpp
index 3a0346abc4..94805a7f80 100644
--- a/src/widgets/platforms/mac/qregion_mac.cpp
+++ b/src/widgets/platforms/mac/qregion_mac.cpp
@@ -66,7 +66,7 @@ static void qt_mac_cleanup_rgncache()
}
#endif
-Q_GUI_EXPORT RgnHandle qt_mac_get_rgn()
+Q_WIDGETS_EXPORT RgnHandle qt_mac_get_rgn()
{
#ifdef RGN_CACHE_SIZE
if(!rgncache_init) {
@@ -90,7 +90,7 @@ Q_GUI_EXPORT RgnHandle qt_mac_get_rgn()
return NewRgn();
}
-Q_GUI_EXPORT void qt_mac_dispose_rgn(RgnHandle r)
+Q_WIDGETS_EXPORT void qt_mac_dispose_rgn(RgnHandle r)
{
#ifdef RGN_CACHE_SIZE
if(rgncache_init && rgncache_used < RGN_CACHE_SIZE) {
@@ -116,7 +116,7 @@ static OSStatus qt_mac_get_rgn_rect(UInt16 msg, RgnHandle, const Rect *rect, voi
return noErr;
}
-Q_GUI_EXPORT QRegion qt_mac_convert_mac_region(RgnHandle rgn)
+Q_WIDGETS_EXPORT QRegion qt_mac_convert_mac_region(RgnHandle rgn)
{
return QRegion::fromQDRgn(rgn);
}
diff --git a/src/widgets/platforms/mac/qt_mac_p.h b/src/widgets/platforms/mac/qt_mac_p.h
index 4625982062..80328c3497 100644
--- a/src/widgets/platforms/mac/qt_mac_p.h
+++ b/src/widgets/platforms/mac/qt_mac_p.h
@@ -138,7 +138,7 @@ public:
void performFade();
};
-class Q_GUI_EXPORT QMacCocoaAutoReleasePool
+class Q_WIDGETS_EXPORT QMacCocoaAutoReleasePool
{
private:
void *pool;
@@ -151,7 +151,7 @@ public:
QString qt_mac_removeMnemonics(const QString &original); //implemented in qmacstyle_mac.cpp
-class Q_GUI_EXPORT QMacWindowChangeEvent
+class Q_WIDGETS_EXPORT QMacWindowChangeEvent
{
private:
static QList<QMacWindowChangeEvent*> *change_events;
diff --git a/src/widgets/platforms/s60/qeventdispatcher_s60_p.h b/src/widgets/platforms/s60/qeventdispatcher_s60_p.h
index 49ec568097..8e644a2d06 100644
--- a/src/widgets/platforms/s60/qeventdispatcher_s60_p.h
+++ b/src/widgets/platforms/s60/qeventdispatcher_s60_p.h
@@ -87,7 +87,7 @@ private:
bool m_hasAlreadyRun;
};
-class Q_GUI_EXPORT QEventDispatcherS60 : public QEventDispatcherSymbian
+class Q_WIDGETS_EXPORT QEventDispatcherS60 : public QEventDispatcherSymbian
{
Q_OBJECT
diff --git a/src/widgets/platforms/win/qapplication_win.cpp b/src/widgets/platforms/win/qapplication_win.cpp
index c34e75ffcc..72b8870fe1 100644
--- a/src/widgets/platforms/win/qapplication_win.cpp
+++ b/src/widgets/platforms/win/qapplication_win.cpp
@@ -237,9 +237,9 @@ static void resolveAygLibs()
# define FE_FONTSMOOTHINGCLEARTYPE 0x0002
#endif
-Q_GUI_EXPORT qreal qt_fontsmoothing_gamma;
-Q_GUI_EXPORT bool qt_cleartype_enabled;
-Q_GUI_EXPORT bool qt_win_owndc_required; // CS_OWNDC is required if we use the GL graphicssystem as default
+Q_WIDGETS_EXPORT qreal qt_fontsmoothing_gamma;
+Q_WIDGETS_EXPORT bool qt_cleartype_enabled;
+Q_WIDGETS_EXPORT bool qt_win_owndc_required; // CS_OWNDC is required if we use the GL graphicssystem as default
typedef HCTX (API *PtrWTOpen)(HWND, LPLOGCONTEXT, BOOL);
typedef BOOL (API *PtrWTClose)(HCTX);
@@ -427,7 +427,7 @@ static bool sm_cancel;
static bool replayPopupMouseEvent = false; // replay handling when popups close
// ignore the next release event if return from a modal widget
-Q_GUI_EXPORT bool qt_win_ignoreNextMouseReleaseEvent = false;
+Q_WIDGETS_EXPORT bool qt_win_ignoreNextMouseReleaseEvent = false;
#if defined(QT_DEBUG)
@@ -946,7 +946,7 @@ void qt_cleanup()
Platform specific global and internal functions
*****************************************************************************/
-Q_GUI_EXPORT HDC qt_win_display_dc() // get display DC
+Q_WIDGETS_EXPORT HDC qt_win_display_dc() // get display DC
{
Q_ASSERT(qApp && qApp->thread() == QThread::currentThread());
if (!displayDC)
@@ -1122,7 +1122,7 @@ const QString qt_reg_winclass(QWidget *w) // register window class
return cname;
}
-Q_GUI_EXPORT const QString qt_getRegisteredWndClass()
+Q_WIDGETS_EXPORT const QString qt_getRegisteredWndClass()
{
return qt_reg_winclass(0);
}
diff --git a/src/widgets/platforms/win/qkeymapper_win.cpp b/src/widgets/platforms/win/qkeymapper_win.cpp
index b981066434..78389c1160 100644
--- a/src/widgets/platforms/win/qkeymapper_win.cpp
+++ b/src/widgets/platforms/win/qkeymapper_win.cpp
@@ -497,7 +497,7 @@ static inline int toKeyOrUnicode(int vk, int scancode, unsigned char *kbdBuffer,
return code == Qt::Key_unknown ? 0 : code;
}
-Q_GUI_EXPORT int qt_translateKeyCode(int vk)
+Q_WIDGETS_EXPORT int qt_translateKeyCode(int vk)
{
int code = winceKeyBend((vk < 0 || vk > 255) ? 0 : vk);
return code == Qt::Key_unknown ? 0 : code;
diff --git a/src/widgets/platforms/x11/qapplication_x11.cpp b/src/widgets/platforms/x11/qapplication_x11.cpp
index 8bf1c70cce..4a392d2a19 100644
--- a/src/widgets/platforms/x11/qapplication_x11.cpp
+++ b/src/widgets/platforms/x11/qapplication_x11.cpp
@@ -328,7 +328,7 @@ static const char * x11_atomnames = {
"ERASER\0"
};
-Q_GUI_EXPORT QX11Data *qt_x11Data = 0;
+Q_WIDGETS_EXPORT QX11Data *qt_x11Data = 0;
/*****************************************************************************
Internal variables and functions
@@ -387,7 +387,7 @@ static bool popupGrabOk;
bool qt_sm_blockUserInput = false; // session management
-Q_GUI_EXPORT int qt_xfocusout_grab_counter = 0;
+Q_WIDGETS_EXPORT int qt_xfocusout_grab_counter = 0;
#if !defined (QT_NO_TABLET)
Q_GLOBAL_STATIC(QTabletDeviceDataList, tablet_devices)
@@ -403,7 +403,7 @@ typedef bool(*QX11FilterFunction)(XEvent *event);
Q_GLOBAL_STATIC(QList<QX11FilterFunction>, x11Filters)
-Q_GUI_EXPORT void qt_installX11EventFilter(QX11FilterFunction func)
+Q_WIDGETS_EXPORT void qt_installX11EventFilter(QX11FilterFunction func)
{
Q_ASSERT(func);
@@ -411,7 +411,7 @@ Q_GUI_EXPORT void qt_installX11EventFilter(QX11FilterFunction func)
list->append(func);
}
-Q_GUI_EXPORT void qt_removeX11EventFilter(QX11FilterFunction func)
+Q_WIDGETS_EXPORT void qt_removeX11EventFilter(QX11FilterFunction func)
{
Q_ASSERT(func);
@@ -447,7 +447,7 @@ extern bool qt_xfixes_clipboard_changed(Window clipboardOwner, Time timestamp);
extern bool qt_xfixes_selection_changed(Window selectionOwner, Time timestamp); //def in qclipboard_x11.cpp
static void qt_save_rootinfo();
-Q_GUI_EXPORT bool qt_try_modal(QWidget *, XEvent *);
+Q_WIDGETS_EXPORT bool qt_try_modal(QWidget *, XEvent *);
QWidget *qt_button_down = 0; // last widget to be pressed with the mouse
QPointer<QWidget> qt_last_mouse_receiver = 0;
@@ -844,7 +844,7 @@ static void qt_x11_create_intern_atoms()
#endif
}
-Q_GUI_EXPORT void qt_x11_apply_settings_in_all_apps()
+Q_WIDGETS_EXPORT void qt_x11_apply_settings_in_all_apps()
{
QByteArray stamp;
QDataStream s(&stamp, QIODevice::WriteOnly);
diff --git a/src/widgets/platforms/x11/qfont_x11.cpp b/src/widgets/platforms/x11/qfont_x11.cpp
index e89e0d9dc2..ba69871855 100644
--- a/src/widgets/platforms/x11/qfont_x11.cpp
+++ b/src/widgets/platforms/x11/qfont_x11.cpp
@@ -118,7 +118,7 @@ QString qt_fallback_font_family(int script)
}
// Sets the fallback family for the specified script.
-Q_GUI_EXPORT void qt_x11_set_fallback_font_family(int script, const QString &family)
+Q_WIDGETS_EXPORT void qt_x11_set_fallback_font_family(int script, const QString &family)
{
FallBackHash *hash = fallBackHash();
if (!family.isEmpty())
diff --git a/src/widgets/platforms/x11/qfontengine_x11.cpp b/src/widgets/platforms/x11/qfontengine_x11.cpp
index e3bfa5df46..9918f82bf7 100644
--- a/src/widgets/platforms/x11/qfontengine_x11.cpp
+++ b/src/widgets/platforms/x11/qfontengine_x11.cpp
@@ -966,7 +966,7 @@ void QFontEngineMultiFT::loadEngine(int at)
-Q_GUI_EXPORT void qt_x11ft_convert_pattern(FcPattern *pattern, QByteArray *file_name, int *index, bool *antialias)
+Q_WIDGETS_EXPORT void qt_x11ft_convert_pattern(FcPattern *pattern, QByteArray *file_name, int *index, bool *antialias)
{
FcChar8 *fileName;
FcPatternGetString(pattern, FC_FILE, 0, &fileName);
diff --git a/src/widgets/platforms/x11/qfontengine_x11_p.h b/src/widgets/platforms/x11/qfontengine_x11_p.h
index 1c0bcada11..b12fbc28d4 100644
--- a/src/widgets/platforms/x11/qfontengine_x11_p.h
+++ b/src/widgets/platforms/x11/qfontengine_x11_p.h
@@ -137,7 +137,7 @@ private:
#ifndef QT_NO_FONTCONFIG
-class Q_GUI_EXPORT QFontEngineMultiFT : public QFontEngineMulti
+class Q_WIDGETS_EXPORT QFontEngineMultiFT : public QFontEngineMulti
{
public:
QFontEngineMultiFT(QFontEngine *fe, FcPattern *firstEnginePattern, FcPattern *p, int s, const QFontDef &request);
@@ -154,7 +154,7 @@ private:
int firstFontIndex; // first font in fontset
};
-class Q_GUI_EXPORT QFontEngineX11FT : public QFontEngineFT
+class Q_WIDGETS_EXPORT QFontEngineX11FT : public QFontEngineFT
{
public:
explicit QFontEngineX11FT(const QFontDef &fontDef) : QFontEngineFT(fontDef) {}
diff --git a/src/widgets/platforms/x11/qpaintdevice_x11.cpp b/src/widgets/platforms/x11/qpaintdevice_x11.cpp
index 4b2a01ffc4..d7ecb06885 100644
--- a/src/widgets/platforms/x11/qpaintdevice_x11.cpp
+++ b/src/widgets/platforms/x11/qpaintdevice_x11.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
can't be obtained.
*/
-Drawable Q_GUI_EXPORT qt_x11Handle(const QPaintDevice *pd)
+Drawable Q_WIDGETS_EXPORT qt_x11Handle(const QPaintDevice *pd)
{
if (!pd) return 0;
if (pd->devType() == QInternal::Widget)
@@ -71,7 +71,7 @@ Drawable Q_GUI_EXPORT qt_x11Handle(const QPaintDevice *pd)
Returns the QX11Info structure for the \a pd paint device. 0 is
returned if it can't be obtained.
*/
-const Q_GUI_EXPORT QX11Info *qt_x11Info(const QPaintDevice *pd)
+const Q_WIDGETS_EXPORT QX11Info *qt_x11Info(const QPaintDevice *pd)
{
if (!pd) return 0;
if (pd->devType() == QInternal::Widget)
diff --git a/src/widgets/platforms/x11/qpaintengine_x11.cpp b/src/widgets/platforms/x11/qpaintengine_x11.cpp
index 44792f4918..a7ea84c918 100644
--- a/src/widgets/platforms/x11/qpaintengine_x11.cpp
+++ b/src/widgets/platforms/x11/qpaintengine_x11.cpp
@@ -97,7 +97,7 @@ static const qreal aliasedCoordinateDelta = 0.5 - 0.015625;
QPainter::begin() must be called before this function returns a
valid GC.
*/
-Q_GUI_EXPORT GC qt_x11_get_pen_gc(QPainter *p)
+Q_WIDGETS_EXPORT GC qt_x11_get_pen_gc(QPainter *p)
{
if (p && p->paintEngine()
&& p->paintEngine()->isActive()
@@ -112,7 +112,7 @@ Q_GUI_EXPORT GC qt_x11_get_pen_gc(QPainter *p)
QPainter::begin() must be called before this function returns a
valid GC.
*/
-Q_GUI_EXPORT GC qt_x11_get_brush_gc(QPainter *p)
+Q_WIDGETS_EXPORT GC qt_x11_get_brush_gc(QPainter *p)
{
if (p && p->paintEngine()
&& p->paintEngine()->isActive()
@@ -148,7 +148,7 @@ static inline int qpainterOpToXrender(QPainter::CompositionMode mode)
// hack, so we don't have to make QRegion::clipRectangles() public or include
// X11 headers in qregion.h
-Q_GUI_EXPORT void *qt_getClipRects(const QRegion &r, int &num)
+Q_WIDGETS_EXPORT void *qt_getClipRects(const QRegion &r, int &num)
{
return r.clipRectangles(num);
}
@@ -1819,7 +1819,7 @@ void QX11PaintEngine::drawPath(const QPainterPath &path)
}
}
-Q_GUI_EXPORT void qt_x11_drawImage(const QRect &rect, const QPoint &pos, const QImage &image,
+Q_WIDGETS_EXPORT void qt_x11_drawImage(const QRect &rect, const QPoint &pos, const QImage &image,
Drawable hd, GC gc, Display *dpy, Visual *visual, int depth)
{
Q_ASSERT(image.format() == QImage::Format_RGB32);
diff --git a/src/widgets/platforms/x11/qpaintengine_x11_p.h b/src/widgets/platforms/x11/qpaintengine_x11_p.h
index d8d8817993..2ff339bbe1 100644
--- a/src/widgets/platforms/x11/qpaintengine_x11_p.h
+++ b/src/widgets/platforms/x11/qpaintengine_x11_p.h
@@ -131,8 +131,8 @@ protected:
friend class QPixmap;
friend class QFontEngineBox;
- friend Q_GUI_EXPORT GC qt_x11_get_pen_gc(QPainter *);
- friend Q_GUI_EXPORT GC qt_x11_get_brush_gc(QPainter *);
+ friend Q_WIDGETS_EXPORT GC qt_x11_get_pen_gc(QPainter *);
+ friend Q_WIDGETS_EXPORT GC qt_x11_get_brush_gc(QPainter *);
private:
Q_DISABLE_COPY(QX11PaintEngine)
diff --git a/src/widgets/platforms/x11/qpixmap_x11.cpp b/src/widgets/platforms/x11/qpixmap_x11.cpp
index 77c2a2a9d9..89f5b0926f 100644
--- a/src/widgets/platforms/x11/qpixmap_x11.cpp
+++ b/src/widgets/platforms/x11/qpixmap_x11.cpp
@@ -311,7 +311,7 @@ static int defaultScreen = -1;
*****************************************************************************/
QBasicAtomicInt qt_pixmap_serial = Q_BASIC_ATOMIC_INITIALIZER(0);
-int Q_GUI_EXPORT qt_x11_preferred_pixmap_depth = 0;
+int Q_WIDGETS_EXPORT qt_x11_preferred_pixmap_depth = 0;
QX11PixmapData::QX11PixmapData(PixelType type)
: QPixmapData(type, X11Class), gl_surface(0), hd(0),
diff --git a/src/widgets/platforms/x11/qpixmap_x11_p.h b/src/widgets/platforms/x11/qpixmap_x11_p.h
index 7cd80e62f9..8c8ccd156c 100644
--- a/src/widgets/platforms/x11/qpixmap_x11_p.h
+++ b/src/widgets/platforms/x11/qpixmap_x11_p.h
@@ -64,7 +64,7 @@ class QX11PaintEngine;
struct QXImageWrapper;
-class Q_GUI_EXPORT QX11PixmapData : public QPixmapData
+class Q_WIDGETS_EXPORT QX11PixmapData : public QPixmapData
{
public:
QX11PixmapData(PixelType type);
diff --git a/src/widgets/platforms/x11/qt_x11_p.h b/src/widgets/platforms/x11/qt_x11_p.h
index 1a9830d42b..ea808fb8a2 100644
--- a/src/widgets/platforms/x11/qt_x11_p.h
+++ b/src/widgets/platforms/x11/qt_x11_p.h
@@ -332,7 +332,7 @@ struct QXdndDropTransaction
class QMimeData;
struct QX11Data;
-extern Q_GUI_EXPORT QX11Data *qt_x11Data;
+extern Q_WIDGETS_EXPORT QX11Data *qt_x11Data;
enum DesktopEnvironment {
DE_UNKNOWN,
diff --git a/src/widgets/platforms/x11/qwidget_x11.cpp b/src/widgets/platforms/x11/qwidget_x11.cpp
index b0dac5f9e8..cd4b7b4e15 100644
--- a/src/widgets/platforms/x11/qwidget_x11.cpp
+++ b/src/widgets/platforms/x11/qwidget_x11.cpp
@@ -341,7 +341,7 @@ void qt_x11_enforce_cursor(QWidget * w, bool force)
}
}
-Q_GUI_EXPORT void qt_x11_enforce_cursor(QWidget * w)
+Q_WIDGETS_EXPORT void qt_x11_enforce_cursor(QWidget * w)
{
qt_x11_enforce_cursor(w, false);
}
@@ -397,7 +397,7 @@ void qt_x11_wait_for_window_manager(QWidget *w, bool sendPostedEvents)
} while(1);
}
-Q_GUI_EXPORT void qt_x11_wait_for_window_manager(QWidget *w)
+Q_WIDGETS_EXPORT void qt_x11_wait_for_window_manager(QWidget *w)
{
qt_x11_wait_for_window_manager(w, true);
}
diff --git a/src/widgets/platforms/x11/qx11embed_x11.h b/src/widgets/platforms/x11/qx11embed_x11.h
index 229cc3d34d..fcf94b60a2 100644
--- a/src/widgets/platforms/x11/qx11embed_x11.h
+++ b/src/widgets/platforms/x11/qx11embed_x11.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Gui)
class QX11EmbedWidgetPrivate;
-class Q_GUI_EXPORT QX11EmbedWidget : public QWidget
+class Q_WIDGETS_EXPORT QX11EmbedWidget : public QWidget
{
Q_OBJECT
public:
@@ -85,7 +85,7 @@ private:
};
class QX11EmbedContainerPrivate;
-class Q_GUI_EXPORT QX11EmbedContainer : public QWidget
+class Q_WIDGETS_EXPORT QX11EmbedContainer : public QWidget
{
Q_OBJECT
public:
diff --git a/src/widgets/platforms/x11/qx11info_x11.h b/src/widgets/platforms/x11/qx11info_x11.h
index 2d81c6be76..ac2c36e175 100644
--- a/src/widgets/platforms/x11/qx11info_x11.h
+++ b/src/widgets/platforms/x11/qx11info_x11.h
@@ -60,7 +60,7 @@ class QX11InfoPrivate;
struct QX11WindowAttributes;
void qt_x11_getX11InfoForWindow(QX11Info * xinfo, const QX11WindowAttributes &a);
-class Q_GUI_EXPORT QX11Info
+class Q_WIDGETS_EXPORT QX11Info
{
public:
QX11Info();