Use Q_WIDGETS_EXPORT for widgets library

Reviewed-by: Lars Knoll

60 files changed, 70 insertions, 70 deletions

diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp
index 57e517ab25..d777cc7567 100644
--- a/src/widgets/widgets/qabstractbutton.cpp
+++ b/src/widgets/widgets/qabstractbutton.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 #define AUTO_REPEAT_DELAY  300
 #define AUTO_REPEAT_INTERVAL 100
 
-Q_GUI_EXPORT extern bool qt_tab_all_widgets;
+Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets;
 
 /*!
     \class QAbstractButton
diff --git a/src/widgets/widgets/qabstractbutton.h b/src/widgets/widgets/qabstractbutton.h
index 6921864ee5..9edfa1b267 100644
--- a/src/widgets/widgets/qabstractbutton.h
+++ b/src/widgets/widgets/qabstractbutton.h
@@ -55,7 +55,7 @@ QT_MODULE(Gui)
 class QButtonGroup;
 class QAbstractButtonPrivate;
 
-class Q_GUI_EXPORT QAbstractButton : public QWidget
+class Q_WIDGETS_EXPORT QAbstractButton : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h
index aad7324c0b..3f2a273297 100644
--- a/src/widgets/widgets/qabstractscrollarea.h
+++ b/src/widgets/widgets/qabstractscrollarea.h
@@ -56,7 +56,7 @@ class QMargins;
 class QScrollBar;
 class QAbstractScrollAreaPrivate;
 
-class Q_GUI_EXPORT QAbstractScrollArea : public QFrame
+class Q_WIDGETS_EXPORT QAbstractScrollArea : public QFrame
 {
     Q_OBJECT
     Q_PROPERTY(Qt::ScrollBarPolicy verticalScrollBarPolicy READ verticalScrollBarPolicy WRITE setVerticalScrollBarPolicy)
diff --git a/src/widgets/widgets/qabstractscrollarea_p.h b/src/widgets/widgets/qabstractscrollarea_p.h
index 27ee19f579..5511d08f4e 100644
--- a/src/widgets/widgets/qabstractscrollarea_p.h
+++ b/src/widgets/widgets/qabstractscrollarea_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 
 class QScrollBar;
 class QAbstractScrollAreaScrollBarContainer;
-class Q_GUI_EXPORT QAbstractScrollAreaPrivate: public QFramePrivate
+class Q_WIDGETS_EXPORT QAbstractScrollAreaPrivate: public QFramePrivate
 {
     Q_DECLARE_PUBLIC(QAbstractScrollArea)
 
diff --git a/src/widgets/widgets/qabstractslider.h b/src/widgets/widgets/qabstractslider.h
index b7f0efdb5f..109798154e 100644
--- a/src/widgets/widgets/qabstractslider.h
+++ b/src/widgets/widgets/qabstractslider.h
@@ -52,7 +52,7 @@ QT_MODULE(Gui)
 
 class QAbstractSliderPrivate;
 
-class Q_GUI_EXPORT QAbstractSlider : public QWidget
+class Q_WIDGETS_EXPORT QAbstractSlider : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qabstractspinbox.h b/src/widgets/widgets/qabstractspinbox.h
index cbb4d209c2..fb3ae2f5ee 100644
--- a/src/widgets/widgets/qabstractspinbox.h
+++ b/src/widgets/widgets/qabstractspinbox.h
@@ -58,7 +58,7 @@ class QLineEdit;
 class QAbstractSpinBoxPrivate;
 class QStyleOptionSpinBox;
 
-class Q_GUI_EXPORT QAbstractSpinBox : public QWidget
+class Q_WIDGETS_EXPORT QAbstractSpinBox : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qbuttongroup.h b/src/widgets/widgets/qbuttongroup.h
index a0472fd2db..e3ef34644e 100644
--- a/src/widgets/widgets/qbuttongroup.h
+++ b/src/widgets/widgets/qbuttongroup.h
@@ -56,7 +56,7 @@ class QAbstractButton;
 class QAbstractButtonPrivate;
 class QButtonGroupPrivate;
 
-class Q_GUI_EXPORT QButtonGroup : public QObject
+class Q_WIDGETS_EXPORT QButtonGroup : public QObject
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h
index 343d161be4..a80bae2f49 100644
--- a/src/widgets/widgets/qcalendarwidget.h
+++ b/src/widgets/widgets/qcalendarwidget.h
@@ -57,7 +57,7 @@ class QDate;
 class QTextCharFormat;
 class QCalendarWidgetPrivate;
 
-class Q_GUI_EXPORT QCalendarWidget : public QWidget
+class Q_WIDGETS_EXPORT QCalendarWidget : public QWidget
 {
     Q_OBJECT
     Q_ENUMS(Qt::DayOfWeek)
diff --git a/src/widgets/widgets/qcheckbox.h b/src/widgets/widgets/qcheckbox.h
index af26e97a83..b040b13be1 100644
--- a/src/widgets/widgets/qcheckbox.h
+++ b/src/widgets/widgets/qcheckbox.h
@@ -53,7 +53,7 @@ QT_MODULE(Gui)
 class QCheckBoxPrivate;
 class QStyleOptionButton;
 
-class Q_GUI_EXPORT QCheckBox : public QAbstractButton
+class Q_WIDGETS_EXPORT QCheckBox : public QAbstractButton
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index 14179a3316..ed766cc004 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -59,7 +59,7 @@ class QLineEdit;
 class QComboBoxPrivate;
 class QCompleter;
 
-class Q_GUI_EXPORT QComboBox : public QWidget
+class Q_WIDGETS_EXPORT QComboBox : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h
index 1c8187b57f..9d01e37b1b 100644
--- a/src/widgets/widgets/qcommandlinkbutton.h
+++ b/src/widgets/widgets/qcommandlinkbutton.h
@@ -52,7 +52,7 @@ QT_MODULE(Gui)
 
 class QCommandLinkButtonPrivate;
 
-class Q_GUI_EXPORT QCommandLinkButton: public QPushButton 
+class Q_WIDGETS_EXPORT QCommandLinkButton: public QPushButton
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h
index ab575e1d3f..a57a5f29e9 100644
--- a/src/widgets/widgets/qdatetimeedit.h
+++ b/src/widgets/widgets/qdatetimeedit.h
@@ -58,7 +58,7 @@ class QDateTimeEditPrivate;
 class QStyleOptionSpinBox;
 class QCalendarWidget;
 
-class Q_GUI_EXPORT QDateTimeEdit : public QAbstractSpinBox
+class Q_WIDGETS_EXPORT QDateTimeEdit : public QAbstractSpinBox
 {
     Q_OBJECT
 
@@ -203,7 +203,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_resetButton())
 };
 
-class Q_GUI_EXPORT QTimeEdit : public QDateTimeEdit
+class Q_WIDGETS_EXPORT QTimeEdit : public QDateTimeEdit
 {
     Q_OBJECT
 public:
@@ -211,7 +211,7 @@ public:
     QTimeEdit(const QTime &time, QWidget *parent = 0);
 };
 
-class Q_GUI_EXPORT QDateEdit : public QDateTimeEdit
+class Q_WIDGETS_EXPORT QDateEdit : public QDateTimeEdit
 {
     Q_OBJECT
 public:
diff --git a/src/widgets/widgets/qdial.h b/src/widgets/widgets/qdial.h
index cfec90e2c2..7687b7e7a1 100644
--- a/src/widgets/widgets/qdial.h
+++ b/src/widgets/widgets/qdial.h
@@ -56,7 +56,7 @@ QT_MODULE(Gui)
 class QDialPrivate;
 class QStyleOptionSlider;
 
-class Q_GUI_EXPORT QDial: public QAbstractSlider
+class Q_WIDGETS_EXPORT QDial: public QAbstractSlider
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h
index ee51e9b06f..0a6e231e3f 100644
--- a/src/widgets/widgets/qdialogbuttonbox.h
+++ b/src/widgets/widgets/qdialogbuttonbox.h
@@ -54,7 +54,7 @@ class QAbstractButton;
 class QPushButton;
 class QDialogButtonBoxPrivate;
 
-class Q_GUI_EXPORT QDialogButtonBox : public QWidget
+class Q_WIDGETS_EXPORT QDialogButtonBox : public QWidget
 {
     Q_OBJECT
     Q_FLAGS(StandardButtons)
diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h
index 65f94d277b..cc81db2fc2 100644
--- a/src/widgets/widgets/qdockwidget.h
+++ b/src/widgets/widgets/qdockwidget.h
@@ -57,7 +57,7 @@ class QDockWidgetPrivate;
 class QMainWindow;
 class QStyleOptionDockWidget;
 
-class Q_GUI_EXPORT QDockWidget : public QWidget
+class Q_WIDGETS_EXPORT QDockWidget : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h
index 416f3aaa87..4d3c4f4d70 100644
--- a/src/widgets/widgets/qdockwidget_p.h
+++ b/src/widgets/widgets/qdockwidget_p.h
@@ -128,7 +128,7 @@ public:
     bool isAnimating() const;
 };
 
-class Q_GUI_EXPORT QDockWidgetLayout : public QLayout
+class Q_WIDGETS_EXPORT QDockWidgetLayout : public QLayout
 {
     Q_OBJECT
 public:
diff --git a/src/widgets/widgets/qeffects_p.h b/src/widgets/widgets/qeffects_p.h
index 4290fd16ad..bae2bbf54a 100644
--- a/src/widgets/widgets/qeffects_p.h
+++ b/src/widgets/widgets/qeffects_p.h
@@ -74,8 +74,8 @@ struct QEffects
     typedef uint DirFlags;
 };
 
-extern void Q_GUI_EXPORT qScrollEffect(QWidget*, QEffects::DirFlags dir = QEffects::DownScroll, int time = -1);
-extern void Q_GUI_EXPORT qFadeEffect(QWidget*, int time = -1);
+extern void Q_WIDGETS_EXPORT qScrollEffect(QWidget*, QEffects::DirFlags dir = QEffects::DownScroll, int time = -1);
+extern void Q_WIDGETS_EXPORT qFadeEffect(QWidget*, int time = -1);
 
 QT_END_NAMESPACE
 
diff --git a/src/widgets/widgets/qfocusframe.h b/src/widgets/widgets/qfocusframe.h
index da6d476715..f4f1d1c854 100644
--- a/src/widgets/widgets/qfocusframe.h
+++ b/src/widgets/widgets/qfocusframe.h
@@ -53,7 +53,7 @@ QT_MODULE(Gui)
 class QFocusFramePrivate;
 class QStyleOption;
 
-class Q_GUI_EXPORT QFocusFrame : public QWidget
+class Q_WIDGETS_EXPORT QFocusFrame : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/widgets/widgets/qfontcombobox.h b/src/widgets/widgets/qfontcombobox.h
index 7dc5cedd1f..b0007207da 100644
--- a/src/widgets/widgets/qfontcombobox.h
+++ b/src/widgets/widgets/qfontcombobox.h
@@ -55,7 +55,7 @@ QT_MODULE(Gui)
 
 class QFontComboBoxPrivate;
 
-class Q_GUI_EXPORT QFontComboBox : public QComboBox
+class Q_WIDGETS_EXPORT QFontComboBox : public QComboBox
 {
     Q_OBJECT
     Q_FLAGS(FontFilters)
diff --git a/src/widgets/widgets/qframe.h b/src/widgets/widgets/qframe.h
index c1013abada..80d41365cd 100644
--- a/src/widgets/widgets/qframe.h
+++ b/src/widgets/widgets/qframe.h
@@ -52,7 +52,7 @@ QT_MODULE(Gui)
 
 class QFramePrivate;
 
-class Q_GUI_EXPORT QFrame : public QWidget
+class Q_WIDGETS_EXPORT QFrame : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h
index 717aaf2cf0..fba094d303 100644
--- a/src/widgets/widgets/qgroupbox.h
+++ b/src/widgets/widgets/qgroupbox.h
@@ -54,7 +54,7 @@ QT_MODULE(Gui)
 
 class QGroupBoxPrivate;
 class QStyleOptionGroupBox;
-class Q_GUI_EXPORT QGroupBox : public QWidget
+class Q_WIDGETS_EXPORT QGroupBox : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qlabel.h b/src/widgets/widgets/qlabel.h
index 0db3bb9de3..d8fc297299 100644
--- a/src/widgets/widgets/qlabel.h
+++ b/src/widgets/widgets/qlabel.h
@@ -52,7 +52,7 @@ QT_MODULE(Gui)
 
 class QLabelPrivate;
 
-class Q_GUI_EXPORT QLabel : public QFrame
+class Q_WIDGETS_EXPORT QLabel : public QFrame
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText)
diff --git a/src/widgets/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h
index 81fa10b23d..7b104cbfcf 100644
--- a/src/widgets/widgets/qlcdnumber.h
+++ b/src/widgets/widgets/qlcdnumber.h
@@ -54,7 +54,7 @@ QT_MODULE(Gui)
 #ifndef QT_NO_LCDNUMBER
 
 class QLCDNumberPrivate;
-class Q_GUI_EXPORT QLCDNumber : public QFrame // LCD number widget
+class Q_WIDGETS_EXPORT QLCDNumber : public QFrame // LCD number widget
 {
     Q_OBJECT
     Q_ENUMS(Mode SegmentStyle)
diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h
index 663438ead9..b0971db968 100644
--- a/src/widgets/widgets/qlineedit.h
+++ b/src/widgets/widgets/qlineedit.h
@@ -63,7 +63,7 @@ class QStyleOptionFrame;
 class QAbstractSpinBox;
 class QDateTimeEdit;
 
-class Q_GUI_EXPORT QLineEdit : public QWidget
+class Q_WIDGETS_EXPORT QLineEdit : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h
index c0d68fc7d1..48eac4f490 100644
--- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h
+++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h
@@ -52,7 +52,7 @@ QT_MODULE(Gui)
 
 class QMacCocoaViewContainerPrivate;
 
-class Q_GUI_EXPORT QMacCocoaViewContainer : public QWidget
+class Q_WIDGETS_EXPORT QMacCocoaViewContainer : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/widgets/widgets/qmacnativewidget_mac.h b/src/widgets/widgets/qmacnativewidget_mac.h
index 97289075c3..935feac58e 100644
--- a/src/widgets/widgets/qmacnativewidget_mac.h
+++ b/src/widgets/widgets/qmacnativewidget_mac.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Gui)
 
 class QMacNativeWidgetPrivate;
-class Q_GUI_EXPORT QMacNativeWidget : public QWidget
+class Q_WIDGETS_EXPORT QMacNativeWidget : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
index f214bcb1a5..b3bd972497 100644
--- a/src/widgets/widgets/qmainwindow.cpp
+++ b/src/widgets/widgets/qmainwindow.cpp
@@ -116,7 +116,7 @@ QMainWindowLayout *qt_mainwindow_layout(const QMainWindow *mainWindow)
 }
 
 #ifdef QT_EXPERIMENTAL_CLIENT_DECORATIONS
-Q_GUI_EXPORT void qt_setMainWindowTitleWidget(QMainWindow *mainWindow, Qt::DockWidgetArea area, QWidget *widget)
+Q_WIDGETS_EXPORT void qt_setMainWindowTitleWidget(QMainWindow *mainWindow, Qt::DockWidgetArea area, QWidget *widget)
 {
     QGridLayout *topLayout = qobject_cast<QGridLayout *>(mainWindow->layout());
     Q_ASSERT(topLayout);
diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h
index d05c060b6a..f060d3f460 100644
--- a/src/widgets/widgets/qmainwindow.h
+++ b/src/widgets/widgets/qmainwindow.h
@@ -60,7 +60,7 @@ class QStatusBar;
 class QToolBar;
 class QMenu;
 
-class Q_GUI_EXPORT QMainWindow : public QWidget
+class Q_WIDGETS_EXPORT QMainWindow : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h
index 16c4954f48..f8116096c7 100644
--- a/src/widgets/widgets/qmainwindowlayout_p.h
+++ b/src/widgets/widgets/qmainwindowlayout_p.h
@@ -73,7 +73,7 @@
 #if defined(Q_DEBUG_MAINWINDOW_LAYOUT) && !defined(QT_NO_DOCKWIDGET)
 QT_BEGIN_NAMESPACE
 class QTextStream;
-Q_GUI_EXPORT void qt_dumpLayout(QTextStream &qout, QMainWindow *window);
+Q_WIDGETS_EXPORT void qt_dumpLayout(QTextStream &qout, QMainWindow *window);
 QT_END_NAMESPACE
 #endif // Q_DEBUG_MAINWINDOW_LAYOUT && !QT_NO_DOCKWIDGET
 
diff --git a/src/widgets/widgets/qmdiarea.h b/src/widgets/widgets/qmdiarea.h
index 27d525bdf4..f1ffb29e53 100644
--- a/src/widgets/widgets/qmdiarea.h
+++ b/src/widgets/widgets/qmdiarea.h
@@ -56,7 +56,7 @@ QT_MODULE(Gui)
 class QMdiSubWindow;
 
 class QMdiAreaPrivate;
-class Q_GUI_EXPORT QMdiArea : public QAbstractScrollArea
+class Q_WIDGETS_EXPORT QMdiArea : public QAbstractScrollArea
 {
     Q_OBJECT
     Q_ENUMS(ViewMode)
diff --git a/src/widgets/widgets/qmdisubwindow.h b/src/widgets/widgets/qmdisubwindow.h
index af4b581acc..88074c7ca5 100644
--- a/src/widgets/widgets/qmdisubwindow.h
+++ b/src/widgets/widgets/qmdisubwindow.h
@@ -57,7 +57,7 @@ class QMdiArea;
 
 namespace QMdi { class ControlContainer; }
 class QMdiSubWindowPrivate;
-class Q_GUI_EXPORT QMdiSubWindow : public QWidget
+class Q_WIDGETS_EXPORT QMdiSubWindow : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY(int keyboardSingleStep READ keyboardSingleStep WRITE setKeyboardSingleStep)
diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h
index 407e10d292..f8bedb3da4 100644
--- a/src/widgets/widgets/qmenu.h
+++ b/src/widgets/widgets/qmenu.h
@@ -69,7 +69,7 @@ class QStyleOptionMenuItem;
 class QMenuItem;
 #endif
 
-class Q_GUI_EXPORT QMenu : public QWidget
+class Q_WIDGETS_EXPORT QMenu : public QWidget
 {
 private:
     Q_OBJECT
diff --git a/src/widgets/widgets/qmenubar.h b/src/widgets/widgets/qmenubar.h
index f56fe378c9..b2a2a227e9 100644
--- a/src/widgets/widgets/qmenubar.h
+++ b/src/widgets/widgets/qmenubar.h
@@ -59,7 +59,7 @@ class QWindowsStyle;
 class QMenuItem;
 #endif
 
-class Q_GUI_EXPORT QMenuBar : public QWidget
+class Q_WIDGETS_EXPORT QMenuBar : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qmenudata.h b/src/widgets/widgets/qmenudata.h
index 3c0f171213..09d2bef802 100644
--- a/src/widgets/widgets/qmenudata.h
+++ b/src/widgets/widgets/qmenudata.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
 
-class Q_GUI_EXPORT QMenuItem : public QAction
+class Q_WIDGETS_EXPORT QMenuItem : public QAction
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h
index a6c627f75a..f302275365 100644
--- a/src/widgets/widgets/qplaintextedit.h
+++ b/src/widgets/widgets/qplaintextedit.h
@@ -66,7 +66,7 @@ class QPlainTextEditPrivate;
 class QMimeData;
 
 
-class Q_GUI_EXPORT QPlainTextEdit : public QAbstractScrollArea
+class Q_WIDGETS_EXPORT QPlainTextEdit : public QAbstractScrollArea
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPlainTextEdit)
@@ -277,7 +277,7 @@ private:
 
 
 class QPlainTextDocumentLayoutPrivate;
-class Q_GUI_EXPORT QPlainTextDocumentLayout : public QAbstractTextDocumentLayout
+class Q_WIDGETS_EXPORT QPlainTextDocumentLayout : public QAbstractTextDocumentLayout
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPlainTextDocumentLayout)
diff --git a/src/widgets/widgets/qprintpreviewwidget.h b/src/widgets/widgets/qprintpreviewwidget.h
index e6c3aac28c..87c908a589 100644
--- a/src/widgets/widgets/qprintpreviewwidget.h
+++ b/src/widgets/widgets/qprintpreviewwidget.h
@@ -55,7 +55,7 @@ QT_MODULE(Gui)
 
 class QPrintPreviewWidgetPrivate;
 
-class Q_GUI_EXPORT QPrintPreviewWidget : public QWidget
+class Q_WIDGETS_EXPORT QPrintPreviewWidget : public QWidget
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPrintPreviewWidget)
diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h
index 1181e6471d..ac34f64a2e 100644
--- a/src/widgets/widgets/qprogressbar.h
+++ b/src/widgets/widgets/qprogressbar.h
@@ -55,7 +55,7 @@ QT_MODULE(Gui)
 class QProgressBarPrivate;
 class QStyleOptionProgressBar;
 
-class Q_GUI_EXPORT QProgressBar : public QWidget
+class Q_WIDGETS_EXPORT QProgressBar : public QWidget
 {
     Q_OBJECT
     Q_ENUMS(Direction)
diff --git a/src/widgets/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h
index af61bfa583..4f1f85dea4 100644
--- a/src/widgets/widgets/qpushbutton.h
+++ b/src/widgets/widgets/qpushbutton.h
@@ -54,7 +54,7 @@ class QPushButtonPrivate;
 class QMenu;
 class QStyleOptionButton;
 
-class Q_GUI_EXPORT QPushButton : public QAbstractButton
+class Q_WIDGETS_EXPORT QPushButton : public QAbstractButton
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qradiobutton.h b/src/widgets/widgets/qradiobutton.h
index b7a0fdb874..e3837253c8 100644
--- a/src/widgets/widgets/qradiobutton.h
+++ b/src/widgets/widgets/qradiobutton.h
@@ -53,7 +53,7 @@ QT_MODULE(Gui)
 class QRadioButtonPrivate;
 class QStyleOptionButton;
 
-class Q_GUI_EXPORT QRadioButton : public QAbstractButton
+class Q_WIDGETS_EXPORT QRadioButton : public QAbstractButton
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qrubberband.h b/src/widgets/widgets/qrubberband.h
index 35cfda0373..3d30004770 100644
--- a/src/widgets/widgets/qrubberband.h
+++ b/src/widgets/widgets/qrubberband.h
@@ -55,7 +55,7 @@ QT_MODULE(Gui)
 class QRubberBandPrivate;
 class QStyleOptionRubberBand;
 
-class Q_GUI_EXPORT QRubberBand : public QWidget
+class Q_WIDGETS_EXPORT QRubberBand : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qscrollarea.h b/src/widgets/widgets/qscrollarea.h
index f8dbc739ae..2d62cc1bc4 100644
--- a/src/widgets/widgets/qscrollarea.h
+++ b/src/widgets/widgets/qscrollarea.h
@@ -54,7 +54,7 @@ QT_MODULE(Gui)
 
 class QScrollAreaPrivate;
 
-class Q_GUI_EXPORT QScrollArea : public QAbstractScrollArea
+class Q_WIDGETS_EXPORT QScrollArea : public QAbstractScrollArea
 {
     Q_OBJECT
     Q_PROPERTY(bool widgetResizable READ widgetResizable WRITE setWidgetResizable)
diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp
index 72f461fe63..534ff6e619 100644
--- a/src/widgets/widgets/qscrollbar.cpp
+++ b/src/widgets/widgets/qscrollbar.cpp
@@ -752,7 +752,7 @@ void QScrollBar::hideEvent(QHideEvent *)
 /*! \internal
     Returns the style option for scroll bar.
 */
-Q_GUI_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollbar)
+Q_WIDGETS_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollbar)
 {
     QStyleOptionSlider opt;
     scrollbar->initStyleOption(&opt);
diff --git a/src/widgets/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h
index a2bcaef1c1..2fd00de522 100644
--- a/src/widgets/widgets/qscrollbar.h
+++ b/src/widgets/widgets/qscrollbar.h
@@ -56,7 +56,7 @@ QT_MODULE(Gui)
 class QScrollBarPrivate;
 class QStyleOptionSlider;
 
-class Q_GUI_EXPORT QScrollBar : public QAbstractSlider
+class Q_WIDGETS_EXPORT QScrollBar : public QAbstractSlider
 {
     Q_OBJECT
 public:
@@ -89,7 +89,7 @@ public:
 #endif
 
 private:
-    friend Q_GUI_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollBar);
+    friend Q_WIDGETS_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollBar);
 
     Q_DISABLE_COPY(QScrollBar)
     Q_DECLARE_PRIVATE(QScrollBar)
diff --git a/src/widgets/widgets/qsizegrip.h b/src/widgets/widgets/qsizegrip.h
index af858ff355..9e75f38457 100644
--- a/src/widgets/widgets/qsizegrip.h
+++ b/src/widgets/widgets/qsizegrip.h
@@ -52,7 +52,7 @@ QT_MODULE(Gui)
 
 #ifndef QT_NO_SIZEGRIP
 class QSizeGripPrivate;
-class Q_GUI_EXPORT QSizeGrip : public QWidget
+class Q_WIDGETS_EXPORT QSizeGrip : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/widgets/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp
index 7529c3c923..2858b98781 100644
--- a/src/widgets/widgets/qslider.cpp
+++ b/src/widgets/widgets/qslider.cpp
@@ -654,7 +654,7 @@ int QSlider::tickInterval() const
 /*! \internal
     Returns the style option for slider.
 */
-Q_GUI_EXPORT QStyleOptionSlider qt_qsliderStyleOption(QSlider *slider)
+Q_WIDGETS_EXPORT QStyleOptionSlider qt_qsliderStyleOption(QSlider *slider)
 {
     QStyleOptionSlider sliderOption;
     slider->initStyleOption(&sliderOption);
diff --git a/src/widgets/widgets/qslider.h b/src/widgets/widgets/qslider.h
index 60326106a3..907548fcb2 100644
--- a/src/widgets/widgets/qslider.h
+++ b/src/widgets/widgets/qslider.h
@@ -54,7 +54,7 @@ QT_MODULE(Gui)
 
 class QSliderPrivate;
 class QStyleOptionSlider;
-class Q_GUI_EXPORT QSlider : public QAbstractSlider
+class Q_WIDGETS_EXPORT QSlider : public QAbstractSlider
 {
     Q_OBJECT
 
@@ -119,7 +119,7 @@ public Q_SLOTS:
 #endif
 
 private:
-    friend Q_GUI_EXPORT QStyleOptionSlider qt_qsliderStyleOption(QSlider *slider);
+    friend Q_WIDGETS_EXPORT QStyleOptionSlider qt_qsliderStyleOption(QSlider *slider);
 
     Q_DISABLE_COPY(QSlider)
     Q_DECLARE_PRIVATE(QSlider)
diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h
index 62060e40c2..1421b1d6d2 100644
--- a/src/widgets/widgets/qspinbox.h
+++ b/src/widgets/widgets/qspinbox.h
@@ -53,7 +53,7 @@ QT_MODULE(Gui)
 #ifndef QT_NO_SPINBOX
 
 class QSpinBoxPrivate;
-class Q_GUI_EXPORT QSpinBox : public QAbstractSpinBox
+class Q_WIDGETS_EXPORT QSpinBox : public QAbstractSpinBox
 {
     Q_OBJECT
 
@@ -123,7 +123,7 @@ private:
 };
 
 class QDoubleSpinBoxPrivate;
-class Q_GUI_EXPORT QDoubleSpinBox : public QAbstractSpinBox
+class Q_WIDGETS_EXPORT QDoubleSpinBox : public QAbstractSpinBox
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h
index c37ac1d617..0faaa628c8 100644
--- a/src/widgets/widgets/qsplashscreen.h
+++ b/src/widgets/widgets/qsplashscreen.h
@@ -54,7 +54,7 @@ QT_MODULE(Gui)
 #ifndef QT_NO_SPLASHSCREEN
 class QSplashScreenPrivate;
 
-class Q_GUI_EXPORT QSplashScreen : public QWidget
+class Q_WIDGETS_EXPORT QSplashScreen : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h
index 7ade853726..09d7d3589d 100644
--- a/src/widgets/widgets/qsplitter.h
+++ b/src/widgets/widgets/qsplitter.h
@@ -59,7 +59,7 @@ template <typename T> class QList;
 
 class QSplitterHandle;
 
-class Q_GUI_EXPORT QSplitter : public QFrame
+class Q_WIDGETS_EXPORT QSplitter : public QFrame
 {
     Q_OBJECT
 
@@ -149,13 +149,13 @@ private:
 
 //#ifdef QT3_SUPPORT
 #ifndef QT_NO_TEXTSTREAM
-Q_GUI_EXPORT QTextStream& operator<<(QTextStream&, const QSplitter&);
-Q_GUI_EXPORT QTextStream& operator>>(QTextStream&, QSplitter&);
+Q_WIDGETS_EXPORT QTextStream& operator<<(QTextStream&, const QSplitter&);
+Q_WIDGETS_EXPORT QTextStream& operator>>(QTextStream&, QSplitter&);
 #endif
 //#endif
 
 class QSplitterHandlePrivate;
-class Q_GUI_EXPORT QSplitterHandle : public QWidget
+class Q_WIDGETS_EXPORT QSplitterHandle : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/widgets/widgets/qstackedwidget.h b/src/widgets/widgets/qstackedwidget.h
index 3c7ef1c4b6..e0275fe27f 100644
--- a/src/widgets/widgets/qstackedwidget.h
+++ b/src/widgets/widgets/qstackedwidget.h
@@ -54,7 +54,7 @@ QT_MODULE(Gui)
 
 class QStackedWidgetPrivate;
 
-class Q_GUI_EXPORT QStackedWidget : public QFrame
+class Q_WIDGETS_EXPORT QStackedWidget : public QFrame
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h
index 170b79b80f..32dfed8f7b 100644
--- a/src/widgets/widgets/qstatusbar.h
+++ b/src/widgets/widgets/qstatusbar.h
@@ -54,7 +54,7 @@ QT_MODULE(Gui)
 
 class QStatusBarPrivate;
 
-class Q_GUI_EXPORT QStatusBar: public QWidget
+class Q_WIDGETS_EXPORT QStatusBar: public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h
index 4d7c22fe5f..3e2ff3e9d0 100644
--- a/src/widgets/widgets/qtabbar.h
+++ b/src/widgets/widgets/qtabbar.h
@@ -56,7 +56,7 @@ class QIcon;
 class QTabBarPrivate;
 class QStyleOptionTab;
 
-class Q_GUI_EXPORT QTabBar: public QWidget
+class Q_WIDGETS_EXPORT QTabBar: public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h
index 912afb4d00..447560f332 100644
--- a/src/widgets/widgets/qtabwidget.h
+++ b/src/widgets/widgets/qtabwidget.h
@@ -57,7 +57,7 @@ class QTabBar;
 class QTabWidgetPrivate;
 class QStyleOptionTabWidgetFrame;
 
-class Q_GUI_EXPORT QTabWidget : public QWidget
+class Q_WIDGETS_EXPORT QTabWidget : public QWidget
 {
     Q_OBJECT
     Q_ENUMS(TabPosition TabShape)
diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h
index 0e4027f080..3f488975ec 100644
--- a/src/widgets/widgets/qtextbrowser.h
+++ b/src/widgets/widgets/qtextbrowser.h
@@ -55,7 +55,7 @@ QT_MODULE(Gui)
 
 class QTextBrowserPrivate;
 
-class Q_GUI_EXPORT QTextBrowser : public QTextEdit
+class Q_WIDGETS_EXPORT QTextBrowser : public QTextEdit
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h
index 30f4778b3c..11c81939ab 100644
--- a/src/widgets/widgets/qtextedit.h
+++ b/src/widgets/widgets/qtextedit.h
@@ -67,7 +67,7 @@ class QMenu;
 class QTextEditPrivate;
 class QMimeData;
 
-class Q_GUI_EXPORT QTextEdit : public QAbstractScrollArea
+class Q_WIDGETS_EXPORT QTextEdit : public QAbstractScrollArea
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QTextEdit)
diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h
index 20f47f5045..98c44f059a 100644
--- a/src/widgets/widgets/qtoolbar.h
+++ b/src/widgets/widgets/qtoolbar.h
@@ -59,7 +59,7 @@ class QIcon;
 class QMainWindow;
 class QStyleOptionToolBar;
 
-class Q_GUI_EXPORT QToolBar : public QWidget
+class Q_WIDGETS_EXPORT QToolBar : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h
index 33808d2990..b08d37e424 100644
--- a/src/widgets/widgets/qtoolbox.h
+++ b/src/widgets/widgets/qtoolbox.h
@@ -55,7 +55,7 @@ QT_MODULE(Gui)
 
 class QToolBoxPrivate;
 
-class Q_GUI_EXPORT QToolBox : public QFrame
+class Q_WIDGETS_EXPORT QToolBox : public QFrame
 {
     Q_OBJECT
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentChanged)
diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h
index a21211374e..7d1ff13409 100644
--- a/src/widgets/widgets/qtoolbutton.h
+++ b/src/widgets/widgets/qtoolbutton.h
@@ -56,7 +56,7 @@ class QToolButtonPrivate;
 class QMenu;
 class QStyleOptionToolButton;
 
-class Q_GUI_EXPORT QToolButton : public QAbstractButton
+class Q_WIDGETS_EXPORT QToolButton : public QAbstractButton
 {
     Q_OBJECT
     Q_ENUMS(Qt::ToolButtonStyle Qt::ArrowType ToolButtonPopupMode)
diff --git a/src/widgets/widgets/qwidgetresizehandler_p.h b/src/widgets/widgets/qwidgetresizehandler_p.h
index 6d63572058..9d09d63967 100644
--- a/src/widgets/widgets/qwidgetresizehandler_p.h
+++ b/src/widgets/widgets/qwidgetresizehandler_p.h
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 class QMouseEvent;
 class QKeyEvent;
 
-class Q_GUI_EXPORT QWidgetResizeHandler : public QObject
+class Q_WIDGETS_EXPORT QWidgetResizeHandler : public QObject
 {
     Q_OBJECT
 
diff --git a/src/widgets/widgets/qworkspace.h b/src/widgets/widgets/qworkspace.h
index d24b0600bb..a251242542 100644
--- a/src/widgets/widgets/qworkspace.h
+++ b/src/widgets/widgets/qworkspace.h
@@ -57,7 +57,7 @@ class QWorkspaceChild;
 class QShowEvent;
 class QWorkspacePrivate;
 
-class Q_GUI_EXPORT QWorkspace : public QWidget
+class Q_WIDGETS_EXPORT QWorkspace : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY(bool scrollBarsEnabled READ scrollBarsEnabled WRITE setScrollBarsEnabled)