17 files changed, 25 insertions, 25 deletions
diff --git a/src/widgets/dialogs/qabstractpagesetupdialog.h b/src/widgets/dialogs/qabstractpagesetupdialog.h
index a1c56e0792..a867a8155b 100644
--- a/src/widgets/dialogs/qabstractpagesetupdialog.h
+++ b/src/widgets/dialogs/qabstractpagesetupdialog.h
@@ -56,7 +56,7 @@ class QAbstractPageSetupDialogPrivate;
 class QPrinter;
 
 // ### Qt 5: Remove this class
-class Q_GUI_EXPORT QAbstractPageSetupDialog : public QDialog
+class Q_WIDGETS_EXPORT QAbstractPageSetupDialog : public QDialog
 {
     Q_DECLARE_PRIVATE(QAbstractPageSetupDialog)
     Q_OBJECT
diff --git a/src/widgets/dialogs/qabstractprintdialog.h b/src/widgets/dialogs/qabstractprintdialog.h
index 99f31be958..29c05d544b 100644
--- a/src/widgets/dialogs/qabstractprintdialog.h
+++ b/src/widgets/dialogs/qabstractprintdialog.h
@@ -56,7 +56,7 @@ class QAbstractPrintDialogPrivate;
 class QPrinter;
 
 // ### Qt 5: remove this class
-class Q_GUI_EXPORT QAbstractPrintDialog : public QDialog
+class Q_WIDGETS_EXPORT QAbstractPrintDialog : public QDialog
 {
     Q_DECLARE_PRIVATE(QAbstractPrintDialog)
     Q_OBJECT
diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h
index b9380498fc..2eb4658634 100644
--- a/src/widgets/dialogs/qcolordialog.h
+++ b/src/widgets/dialogs/qcolordialog.h
@@ -54,7 +54,7 @@ QT_MODULE(Gui)
 
 class QColorDialogPrivate;
 
-class Q_GUI_EXPORT QColorDialog : public QDialog
+class Q_WIDGETS_EXPORT QColorDialog : public QDialog
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QColorDialog)
diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h
index cc85dd557d..ce8aa91bc7 100644
--- a/src/widgets/dialogs/qdialog.h
+++ b/src/widgets/dialogs/qdialog.h
@@ -53,7 +53,7 @@ QT_MODULE(Gui)
 class QPushButton;
 class QDialogPrivate;
 
-class Q_GUI_EXPORT QDialog : public QWidget
+class Q_WIDGETS_EXPORT QDialog : public QWidget
 {
     Q_OBJECT
     friend class QPushButton;
diff --git a/src/widgets/dialogs/qdialogsbinarycompat_win.cpp b/src/widgets/dialogs/qdialogsbinarycompat_win.cpp
index 0a29422c2e..09c96eaafd 100644
--- a/src/widgets/dialogs/qdialogsbinarycompat_win.cpp
+++ b/src/widgets/dialogs/qdialogsbinarycompat_win.cpp
@@ -69,7 +69,7 @@ class QFontDialogPrivate;
 class QInputDialogPrivate;
 class QWidget;
 
-class Q_GUI_EXPORT QColorDialog
+class Q_WIDGETS_EXPORT QColorDialog
 {
 private:
     explicit QColorDialog(QWidget *, bool);
@@ -92,7 +92,7 @@ bool QColorDialog::selectColor(const QColor &) { return false; }
 void QColorDialog::setSelectedAlpha(int) {}
 int QColorDialog::selectedAlpha() const { return 0; }
 
-class Q_GUI_EXPORT QFontDialog
+class Q_WIDGETS_EXPORT QFontDialog
 {
 private:
     explicit QFontDialog(QWidget *, bool, Qt::WindowFlags);
@@ -118,7 +118,7 @@ void QFontDialog::updateStyles() {}
 void QFontDialog::updateSizes() {}
 QFont QFontDialog::getFont(bool *, const QFont *, QWidget *) { return QFont(); }
 
-class Q_GUI_EXPORT QInputDialog
+class Q_WIDGETS_EXPORT QInputDialog
 {
 private:
     enum Type { LineEdit, SpinBox, DoubleSpinBox, ComboBox, EditableComboBox };
diff --git a/src/widgets/dialogs/qerrormessage.h b/src/widgets/dialogs/qerrormessage.h
index 4142fae648..a8805a2372 100644
--- a/src/widgets/dialogs/qerrormessage.h
+++ b/src/widgets/dialogs/qerrormessage.h
@@ -54,7 +54,7 @@ QT_MODULE(Gui)
 
 class QErrorMessagePrivate;
 
-class Q_GUI_EXPORT QErrorMessage: public QDialog
+class Q_WIDGETS_EXPORT QErrorMessage: public QDialog
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QErrorMessage)
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index c22af651cf..d3df5c9a2c 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -78,16 +78,16 @@ Q_GLOBAL_STATIC(QString, lastVisitedDir)
     Exported hooks that can be used to customize the static functions.
  */
 typedef QString (*_qt_filedialog_existing_directory_hook)(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options);
-Q_GUI_EXPORT _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook = 0;
+Q_WIDGETS_EXPORT _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook = 0;
 
 typedef QString (*_qt_filedialog_open_filename_hook)(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
-Q_GUI_EXPORT _qt_filedialog_open_filename_hook qt_filedialog_open_filename_hook = 0;
+Q_WIDGETS_EXPORT _qt_filedialog_open_filename_hook qt_filedialog_open_filename_hook = 0;
 
 typedef QStringList (*_qt_filedialog_open_filenames_hook)(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
-Q_GUI_EXPORT _qt_filedialog_open_filenames_hook qt_filedialog_open_filenames_hook = 0;
+Q_WIDGETS_EXPORT _qt_filedialog_open_filenames_hook qt_filedialog_open_filenames_hook = 0;
 
 typedef QString (*_qt_filedialog_save_filename_hook)(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
-Q_GUI_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook = 0;
+Q_WIDGETS_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook = 0;
 
 /*!
   \class QFileDialog
@@ -293,7 +293,7 @@ Q_GUI_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook
 */
 
 #if defined(Q_WS_WIN) || defined(Q_WS_MAC)
-bool Q_GUI_EXPORT qt_use_native_dialogs = true; // for the benefit of testing tools, until we have a proper API
+bool Q_WIDGETS_EXPORT qt_use_native_dialogs = true; // for the benefit of testing tools, until we have a proper API
 #endif
 
 QT_BEGIN_INCLUDE_NAMESPACE
diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h
index 5f2f410ad4..1fd7c25255 100644
--- a/src/widgets/dialogs/qfiledialog.h
+++ b/src/widgets/dialogs/qfiledialog.h
@@ -63,7 +63,7 @@ class QAbstractItemDelegate;
 class QAbstractProxyModel;
 class QUrl;
 
-class Q_GUI_EXPORT QFileDialog : public QDialog
+class Q_WIDGETS_EXPORT QFileDialog : public QDialog
 {
     Q_OBJECT
     Q_ENUMS(ViewMode FileMode AcceptMode Option)
diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h
index 2cccdadc42..ce907cd10e 100644
--- a/src/widgets/dialogs/qfilesystemmodel.h
+++ b/src/widgets/dialogs/qfilesystemmodel.h
@@ -60,7 +60,7 @@ class ExtendedInformation;
 class QFileSystemModelPrivate;
 class QFileIconProvider;
 
-class Q_GUI_EXPORT QFileSystemModel : public QAbstractItemModel
+class Q_WIDGETS_EXPORT QFileSystemModel : public QAbstractItemModel
 {
     Q_OBJECT
     Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks)
diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h
index 1b993a00eb..03ef2b7e81 100644
--- a/src/widgets/dialogs/qfontdialog.h
+++ b/src/widgets/dialogs/qfontdialog.h
@@ -56,7 +56,7 @@ QT_MODULE(Gui)
 
 class QFontDialogPrivate;
 
-class Q_GUI_EXPORT QFontDialog : public QDialog
+class Q_WIDGETS_EXPORT QFontDialog : public QDialog
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QFontDialog)
diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h
index fb6541e2d9..51411c7ae1 100644
--- a/src/widgets/dialogs/qinputdialog.h
+++ b/src/widgets/dialogs/qinputdialog.h
@@ -56,7 +56,7 @@ QT_MODULE(Gui)
 
 class QInputDialogPrivate;
 
-class Q_GUI_EXPORT QInputDialog : public QDialog
+class Q_WIDGETS_EXPORT QInputDialog : public QDialog
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QInputDialog)
diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h
index c9698237e9..b2c99d3881 100644
--- a/src/widgets/dialogs/qmessagebox.h
+++ b/src/widgets/dialogs/qmessagebox.h
@@ -56,7 +56,7 @@ class QLabel;
 class QMessageBoxPrivate;
 class QAbstractButton;
 
-class Q_GUI_EXPORT QMessageBox : public QDialog
+class Q_WIDGETS_EXPORT QMessageBox : public QDialog
 {
     Q_OBJECT
     Q_ENUMS(Icon)
diff --git a/src/widgets/dialogs/qpagesetupdialog.h b/src/widgets/dialogs/qpagesetupdialog.h
index ac624255c7..a41b46cf15 100644
--- a/src/widgets/dialogs/qpagesetupdialog.h
+++ b/src/widgets/dialogs/qpagesetupdialog.h
@@ -54,7 +54,7 @@ QT_MODULE(Gui)
 
 class QPageSetupDialogPrivate;
 
-class Q_GUI_EXPORT QPageSetupDialog : public QAbstractPageSetupDialog
+class Q_WIDGETS_EXPORT QPageSetupDialog : public QAbstractPageSetupDialog
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPageSetupDialog)
diff --git a/src/widgets/dialogs/qprintdialog.h b/src/widgets/dialogs/qprintdialog.h
index 14ed7476c3..1bde1d1deb 100644
--- a/src/widgets/dialogs/qprintdialog.h
+++ b/src/widgets/dialogs/qprintdialog.h
@@ -59,7 +59,7 @@ class QPrinter;
 #if defined (Q_OS_UNIX) && !defined(QTOPIA_PRINTDIALOG) && !defined(Q_WS_MAC) && !defined(Q_OS_SYMBIAN)
 class QUnixPrintWidgetPrivate;
 
-class Q_GUI_EXPORT QUnixPrintWidget : public QWidget
+class Q_WIDGETS_EXPORT QUnixPrintWidget : public QWidget
 {
     Q_OBJECT
 
@@ -78,7 +78,7 @@ private:
 };
 #endif
 
-class Q_GUI_EXPORT QPrintDialog : public QAbstractPrintDialog
+class Q_WIDGETS_EXPORT QPrintDialog : public QAbstractPrintDialog
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPrintDialog)
diff --git a/src/widgets/dialogs/qprintpreviewdialog.h b/src/widgets/dialogs/qprintpreviewdialog.h
index a26b014713..e02393af2e 100644
--- a/src/widgets/dialogs/qprintpreviewdialog.h
+++ b/src/widgets/dialogs/qprintpreviewdialog.h
@@ -55,7 +55,7 @@ QT_MODULE(Gui)
 class QGraphicsView;
 class QPrintPreviewDialogPrivate;
 
-class Q_GUI_EXPORT QPrintPreviewDialog : public QDialog
+class Q_WIDGETS_EXPORT QPrintPreviewDialog : public QDialog
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPrintPreviewDialog)
diff --git a/src/widgets/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h
index dded72e0cc..b981e5ef63 100644
--- a/src/widgets/dialogs/qprogressdialog.h
+++ b/src/widgets/dialogs/qprogressdialog.h
@@ -58,7 +58,7 @@ class QProgressBar;
 class QTimer;
 class QProgressDialogPrivate;
 
-class Q_GUI_EXPORT QProgressDialog : public QDialog
+class Q_WIDGETS_EXPORT QProgressDialog : public QDialog
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QProgressDialog)
diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h
index d7ab34a94b..77eef53037 100644
--- a/src/widgets/dialogs/qwizard.h
+++ b/src/widgets/dialogs/qwizard.h
@@ -56,7 +56,7 @@ class QAbstractButton;
 class QWizardPage;
 class QWizardPrivate;
 
-class Q_GUI_EXPORT QWizard : public QDialog
+class Q_WIDGETS_EXPORT QWizard : public QDialog
 {
     Q_OBJECT
     Q_ENUMS(WizardStyle WizardOption)
@@ -211,7 +211,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QWizard::WizardOptions)
 
 class QWizardPagePrivate;
 
-class Q_GUI_EXPORT QWizardPage : public QWidget
+class Q_WIDGETS_EXPORT QWizardPage : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle)