13 files changed, 26 insertions, 26 deletions
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();