diff options
author | Lars Knoll <lars.knoll@qt.io> | 2016-06-03 14:31:40 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2016-07-14 13:46:07 +0000 |
commit | 8fc1cd085cabba911cb4b18e91fbe158db13a2a8 (patch) | |
tree | 8cb77a0bd11da59358aae2028f1aa1e740db8600 /src/widgets/dialogs | |
parent | 64507c7165e42c2a5029353d8f97a0d841fa6b01 (diff) | |
download | qtbase-8fc1cd085cabba911cb4b18e91fbe158db13a2a8.tar.gz |
Add qtwidgetsglobal.h and qtwidgetsglobal_p.h
The new modular configuration system requires one global
header per module, that is included by all other files in
this module.
That header will later on #include the configuration file
for Qt Widgets. For now it defines the Q_WIDGETS_EXPORT
macro for this library.
Change-Id: I6698989b952b9bac94d086d9f219e03c000f7d53
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r-- | src/widgets/dialogs/qcolordialog.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qdialog.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qdialog_p.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qerrormessage.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qfiledialog.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qfiledialog_p.h | 2 | ||||
-rw-r--r-- | src/widgets/dialogs/qfileinfogatherer_p.h | 2 | ||||
-rw-r--r-- | src/widgets/dialogs/qfilesystemmodel.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qfilesystemmodel_p.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qfontdialog.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qfontdialog_p.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qfscompleter_p.h | 6 | ||||
-rw-r--r-- | src/widgets/dialogs/qinputdialog.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qmessagebox.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qprogressdialog.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qsidebar_p.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qwizard.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qwizard_win_p.h | 2 |
18 files changed, 24 insertions, 2 deletions
diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index b036570427..3b56f0b5d1 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -40,6 +40,7 @@ #ifndef QCOLORDIALOG_H #define QCOLORDIALOG_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qdialog.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h index 562fbb63bb..265790b0e5 100644 --- a/src/widgets/dialogs/qdialog.h +++ b/src/widgets/dialogs/qdialog.h @@ -40,6 +40,7 @@ #ifndef QDIALOG_H #define QDIALOG_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h index 6fe4b602a1..1c7c5f3c2a 100644 --- a/src/widgets/dialogs/qdialog_p.h +++ b/src/widgets/dialogs/qdialog_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qwidget_p.h" #include "QtCore/qeventloop.h" #include "QtCore/qpointer.h" diff --git a/src/widgets/dialogs/qerrormessage.h b/src/widgets/dialogs/qerrormessage.h index 03d0dbf5c5..5ffa568c10 100644 --- a/src/widgets/dialogs/qerrormessage.h +++ b/src/widgets/dialogs/qerrormessage.h @@ -40,6 +40,7 @@ #ifndef QERRORMESSAGE_H #define QERRORMESSAGE_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qdialog.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index f13cb98e96..4ade50793d 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -40,6 +40,7 @@ #ifndef QFILEDIALOG_H #define QFILEDIALOG_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qdir.h> #include <QtCore/qstring.h> #include <QtCore/qurl.h> diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index d10f6d7065..afebad4457 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtWidgets/private/qtwidgetsglobal_p.h> #ifndef QT_NO_FILEDIALOG diff --git a/src/widgets/dialogs/qfileinfogatherer_p.h b/src/widgets/dialogs/qfileinfogatherer_p.h index a6ae136c21..3186e9d015 100644 --- a/src/widgets/dialogs/qfileinfogatherer_p.h +++ b/src/widgets/dialogs/qfileinfogatherer_p.h @@ -51,6 +51,8 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> + #include <qthread.h> #include <qmutex.h> #include <qwaitcondition.h> diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h index 6d50d0b606..7d790124c8 100644 --- a/src/widgets/dialogs/qfilesystemmodel.h +++ b/src/widgets/dialogs/qfilesystemmodel.h @@ -40,6 +40,7 @@ #ifndef QFILESYSTEMMODEL_H #define QFILESYSTEMMODEL_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qabstractitemmodel.h> #include <QtCore/qpair.h> #include <QtCore/qdir.h> diff --git a/src/widgets/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h index beb25f665d..92398d981f 100644 --- a/src/widgets/dialogs/qfilesystemmodel_p.h +++ b/src/widgets/dialogs/qfilesystemmodel_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qfilesystemmodel.h" #ifndef QT_NO_FILESYSTEMMODEL diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index f76ce1b7f3..276f8f5e83 100644 --- a/src/widgets/dialogs/qfontdialog.h +++ b/src/widgets/dialogs/qfontdialog.h @@ -40,6 +40,7 @@ #ifndef QFONTDIALOG_H #define QFONTDIALOG_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtGui/qwindowdefs.h> #include <QtWidgets/qdialog.h> #include <QtGui/qfont.h> diff --git a/src/widgets/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h index d6a6e87ee2..033f5a2be8 100644 --- a/src/widgets/dialogs/qfontdialog_p.h +++ b/src/widgets/dialogs/qfontdialog_p.h @@ -52,6 +52,7 @@ // // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qdialog_p.h" #include "qfontdatabase.h" #include "qfontdialog.h" diff --git a/src/widgets/dialogs/qfscompleter_p.h b/src/widgets/dialogs/qfscompleter_p.h index a3341999f7..c073fa1521 100644 --- a/src/widgets/dialogs/qfscompleter_p.h +++ b/src/widgets/dialogs/qfscompleter_p.h @@ -51,9 +51,12 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qcompleter.h" #include <QtWidgets/qfilesystemmodel.h> + QT_BEGIN_NAMESPACE + #ifndef QT_NO_FSCOMPLETER /*! @@ -74,7 +77,10 @@ public: QAbstractProxyModel *proxyModel; QFileSystemModel *sourceModel; }; + #endif // QT_NO_FSCOMPLETER + QT_END_NAMESPACE + #endif // QFSCOMPLETOR_P_H diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index 8adaf5a430..2fbea908cb 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -40,6 +40,7 @@ #ifndef QINPUTDIALOG_H #define QINPUTDIALOG_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qdialog.h> #include <QtCore/qstring.h> #include <QtWidgets/qlineedit.h> diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index 8cded63a3c..c6a55964fe 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -40,6 +40,7 @@ #ifndef QMESSAGEBOX_H #define QMESSAGEBOX_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qdialog.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h index 888deac046..a5e333259f 100644 --- a/src/widgets/dialogs/qprogressdialog.h +++ b/src/widgets/dialogs/qprogressdialog.h @@ -40,6 +40,7 @@ #ifndef QPROGRESSDIALOG_H #define QPROGRESSDIALOG_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qdialog.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qsidebar_p.h b/src/widgets/dialogs/qsidebar_p.h index 210c86be01..3e177e7e68 100644 --- a/src/widgets/dialogs/qsidebar_p.h +++ b/src/widgets/dialogs/qsidebar_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <qlistwidget.h> #include <qstandarditemmodel.h> #include <qstyleditemdelegate.h> diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index a188833ef3..9ce68b6566 100644 --- a/src/widgets/dialogs/qwizard.h +++ b/src/widgets/dialogs/qwizard.h @@ -40,6 +40,7 @@ #ifndef QWIZARD_H #define QWIZARD_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qdialog.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h index c0aa6f7bc4..288e7adaf5 100644 --- a/src/widgets/dialogs/qwizard_win_p.h +++ b/src/widgets/dialogs/qwizard_win_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtWidgets/private/qtwidgetsglobal_p.h> #ifndef QT_NO_WIZARD #ifndef QT_NO_STYLE_WINDOWSVISTA |