AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Q_WIDGETS_EXPORT for widgets library

Browse Source 
Reviewed-by: Lars Knoll
This commit is contained in:
Olli Werwolff 2011-06-08 09:51:07 +02:00
parent 6a243e5559
commit 819f9ca965
227 changed files with 465 additions and 450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/corelib/global/qglobal.h
View File

@ -1299,6 +1299,11 @@ class QDataStream;
# else # else
# define Q_GUI_EXPORT Q_DECL_IMPORT # define Q_GUI_EXPORT Q_DECL_IMPORT
# endif # endif
# if defined(QT_BUILD_WIDGETS_LIB)
# define Q_WIDGETS_EXPORT Q_DECL_EXPORT
# else
# define Q_WIDGETS_EXPORT Q_DECL_IMPORT
# endif
# if defined(QT_BUILD_SQL_LIB) # if defined(QT_BUILD_SQL_LIB)
# define Q_SQL_EXPORT Q_DECL_EXPORT # define Q_SQL_EXPORT Q_DECL_EXPORT
# else # else
@ -1383,6 +1388,7 @@ class QDataStream;
# elif defined(QT_DLL) /* use a Qt DLL library */ # elif defined(QT_DLL) /* use a Qt DLL library */
# define Q_CORE_EXPORT Q_DECL_IMPORT # define Q_CORE_EXPORT Q_DECL_IMPORT
# define Q_GUI_EXPORT Q_DECL_IMPORT # define Q_GUI_EXPORT Q_DECL_IMPORT
# define Q_WIDGETS_EXPORT Q_DECL_IMPORT
# define Q_SQL_EXPORT Q_DECL_IMPORT # define Q_SQL_EXPORT Q_DECL_IMPORT
# define Q_NETWORK_EXPORT Q_DECL_IMPORT # define Q_NETWORK_EXPORT Q_DECL_IMPORT
# define Q_SVG_EXPORT Q_DECL_IMPORT # define Q_SVG_EXPORT Q_DECL_IMPORT
@ -1415,6 +1421,7 @@ class QDataStream;
# if defined(QT_SHARED) # if defined(QT_SHARED)
# define Q_CORE_EXPORT Q_DECL_EXPORT # define Q_CORE_EXPORT Q_DECL_EXPORT
# define Q_GUI_EXPORT Q_DECL_EXPORT # define Q_GUI_EXPORT Q_DECL_EXPORT
# define Q_WIDGETS_EXPORT Q_DECL_EXPORT
# define Q_SQL_EXPORT Q_DECL_EXPORT # define Q_SQL_EXPORT Q_DECL_EXPORT
# define Q_NETWORK_EXPORT Q_DECL_EXPORT # define Q_NETWORK_EXPORT Q_DECL_EXPORT
# define Q_SVG_EXPORT Q_DECL_EXPORT # define Q_SVG_EXPORT Q_DECL_EXPORT
@ -1433,6 +1440,7 @@ class QDataStream;
# else # else
# define Q_CORE_EXPORT # define Q_CORE_EXPORT
# define Q_GUI_EXPORT # define Q_GUI_EXPORT
# define Q_WIDGETS_EXPORT
# define Q_SQL_EXPORT # define Q_SQL_EXPORT
# define Q_NETWORK_EXPORT # define Q_NETWORK_EXPORT
# define Q_SVG_EXPORT # define Q_SVG_EXPORT
@ -1463,6 +1471,11 @@ class QDataStream;
# else # else
# define Q_GUI_EXPORT_INLINE inline # define Q_GUI_EXPORT_INLINE inline
# endif # endif
# if defined(QT_BUILD_WIDGETS_LIB)
# define Q_WIDGETS_EXPORT_INLINE Q_WIDGETS_EXPORT inline
# else
# define Q_WIDGETS_EXPORT_INLINE inline
# endif
# if defined(QT_BUILD_COMPAT_LIB) # if defined(QT_BUILD_COMPAT_LIB)
# define Q_COMPAT_EXPORT_INLINE Q_COMPAT_EXPORT inline # define Q_COMPAT_EXPORT_INLINE Q_COMPAT_EXPORT inline
# else # else
@ -1474,10 +1487,12 @@ class QDataStream;
// note: this affects the contents of the DEF files (ie. these functions do not appear) // note: this affects the contents of the DEF files (ie. these functions do not appear)
# define Q_CORE_EXPORT_INLINE inline # define Q_CORE_EXPORT_INLINE inline
# define Q_GUI_EXPORT_INLINE inline # define Q_GUI_EXPORT_INLINE inline
# define Q_WIDGETS_EXPORT_INLINE inline
# define Q_COMPAT_EXPORT_INLINE inline # define Q_COMPAT_EXPORT_INLINE inline
#else #else
# define Q_CORE_EXPORT_INLINE Q_CORE_EXPORT inline # define Q_CORE_EXPORT_INLINE Q_CORE_EXPORT inline
# define Q_GUI_EXPORT_INLINE Q_GUI_EXPORT inline # define Q_GUI_EXPORT_INLINE Q_GUI_EXPORT inline
# define Q_WIDGETS_EXPORT_INLINE Q_WIDGETS_EXPORT inline
# define Q_COMPAT_EXPORT_INLINE Q_COMPAT_EXPORT inline # define Q_COMPAT_EXPORT_INLINE Q_COMPAT_EXPORT inline
#endif #endif

8
src/widgets/accessible/qaccessible.h
View File

@ -61,7 +61,7 @@ QT_MODULE(Gui)
class QAccessibleInterface; class QAccessibleInterface;
class Q_GUI_EXPORT QAccessible class Q_WIDGETS_EXPORT QAccessible
{ {
public: public:
enum Event { enum Event {
@ -357,7 +357,7 @@ class QAccessibleTableInterface;
class QAccessibleActionInterface; class QAccessibleActionInterface;
class QAccessibleImageInterface; class QAccessibleImageInterface;
class Q_GUI_EXPORT QAccessibleInterface : public QAccessible class Q_WIDGETS_EXPORT QAccessibleInterface : public QAccessible
{ {
public: public:
virtual ~QAccessibleInterface() {} virtual ~QAccessibleInterface() {}
@ -423,7 +423,7 @@ private:
QAccessible2Interface *cast_helper(QAccessible2::InterfaceType); QAccessible2Interface *cast_helper(QAccessible2::InterfaceType);
}; };
class Q_GUI_EXPORT QAccessibleInterfaceEx: public QAccessibleInterface class Q_WIDGETS_EXPORT QAccessibleInterfaceEx: public QAccessibleInterface
{ {
public: public:
virtual QVariant invokeMethodEx(Method method, int child, const QVariantList &params) = 0; virtual QVariant invokeMethodEx(Method method, int child, const QVariantList &params) = 0;
@ -433,7 +433,7 @@ public:
}; };
class Q_GUI_EXPORT QAccessibleEvent : public QEvent class Q_WIDGETS_EXPORT QAccessibleEvent : public QEvent
{ {
public: public:
inline QAccessibleEvent(Type type, int child); inline QAccessibleEvent(Type type, int child);

16
src/widgets/accessible/qaccessible2.h
View File

@ -70,7 +70,7 @@ namespace QAccessible2
}; };
} }
class Q_GUI_EXPORT QAccessible2Interface class Q_WIDGETS_EXPORT QAccessible2Interface
{ {
public: public:
virtual ~QAccessible2Interface() {} virtual ~QAccessible2Interface() {}
@ -106,7 +106,7 @@ inline QAccessible2Interface *qAccessibleImageCastHelper() { return 0; }
} \ } \
private: private:
class Q_GUI_EXPORT QAccessibleTextInterface: public QAccessible2Interface class Q_WIDGETS_EXPORT QAccessibleTextInterface: public QAccessible2Interface
{ {
public: public:
inline QAccessible2Interface *qAccessibleTextCastHelper() { return this; } inline QAccessible2Interface *qAccessibleTextCastHelper() { return this; }
@ -134,7 +134,7 @@ public:
virtual void scrollToSubstring(int startIndex, int endIndex) = 0; virtual void scrollToSubstring(int startIndex, int endIndex) = 0;
}; };
class Q_GUI_EXPORT QAccessibleEditableTextInterface: public QAccessible2Interface class Q_WIDGETS_EXPORT QAccessibleEditableTextInterface: public QAccessible2Interface
{ {
public: public:
inline QAccessible2Interface *qAccessibleEditableTextCastHelper() { return this; } inline QAccessible2Interface *qAccessibleEditableTextCastHelper() { return this; }
@ -150,7 +150,7 @@ public:
virtual void setAttributes(int startOffset, int endOffset, const QString &attributes) = 0; virtual void setAttributes(int startOffset, int endOffset, const QString &attributes) = 0;
}; };
class Q_GUI_EXPORT QAccessibleSimpleEditableTextInterface: public QAccessibleEditableTextInterface class Q_WIDGETS_EXPORT QAccessibleSimpleEditableTextInterface: public QAccessibleEditableTextInterface
{ {
public: public:
QAccessibleSimpleEditableTextInterface(QAccessibleInterface *accessibleInterface); QAccessibleSimpleEditableTextInterface(QAccessibleInterface *accessibleInterface);
@ -167,7 +167,7 @@ private:
QAccessibleInterface *iface; QAccessibleInterface *iface;
}; };
class Q_GUI_EXPORT QAccessibleValueInterface: public QAccessible2Interface class Q_WIDGETS_EXPORT QAccessibleValueInterface: public QAccessible2Interface
{ {
public: public:
inline QAccessible2Interface *qAccessibleValueCastHelper() { return this; } inline QAccessible2Interface *qAccessibleValueCastHelper() { return this; }
@ -180,7 +180,7 @@ public:
virtual QVariant minimumValue() = 0; virtual QVariant minimumValue() = 0;
}; };
class Q_GUI_EXPORT QAccessibleTableInterface: public QAccessible2Interface class Q_WIDGETS_EXPORT QAccessibleTableInterface: public QAccessible2Interface
{ {
public: public:
inline QAccessible2Interface *qAccessibleTableCastHelper() { return this; } inline QAccessible2Interface *qAccessibleTableCastHelper() { return this; }
@ -214,7 +214,7 @@ public:
int *columnSpan, bool *isSelected) = 0; int *columnSpan, bool *isSelected) = 0;
}; };
class Q_GUI_EXPORT QAccessibleActionInterface : public QAccessible2Interface class Q_WIDGETS_EXPORT QAccessibleActionInterface : public QAccessible2Interface
{ {
public: public:
inline QAccessible2Interface *qAccessibleActionCastHelper() { return this; } inline QAccessible2Interface *qAccessibleActionCastHelper() { return this; }
@ -227,7 +227,7 @@ public:
virtual QStringList keyBindings(int actionIndex) = 0; virtual QStringList keyBindings(int actionIndex) = 0;
}; };
class Q_GUI_EXPORT QAccessibleImageInterface : public QAccessible2Interface class Q_WIDGETS_EXPORT QAccessibleImageInterface : public QAccessible2Interface
{ {
public: public:
inline QAccessible2Interface *qAccessibleImageCastHelper() { return this; } inline QAccessible2Interface *qAccessibleImageCastHelper() { return this; }

4
src/widgets/accessible/qaccessiblebridge.h
View File

@ -63,7 +63,7 @@ public:
virtual void notifyAccessibilityUpdate(int, QAccessibleInterface*, int) = 0; virtual void notifyAccessibilityUpdate(int, QAccessibleInterface*, int) = 0;
}; };
struct Q_GUI_EXPORT QAccessibleBridgeFactoryInterface : public QFactoryInterface struct Q_WIDGETS_EXPORT QAccessibleBridgeFactoryInterface : public QFactoryInterface
{ {
virtual QAccessibleBridge *create(const QString& name) = 0; virtual QAccessibleBridge *create(const QString& name) = 0;
}; };
@ -71,7 +71,7 @@ struct Q_GUI_EXPORT QAccessibleBridgeFactoryInterface : public QFactoryInterface
#define QAccessibleBridgeFactoryInterface_iid "com.trolltech.Qt.QAccessibleBridgeFactoryInterface" #define QAccessibleBridgeFactoryInterface_iid "com.trolltech.Qt.QAccessibleBridgeFactoryInterface"
Q_DECLARE_INTERFACE(QAccessibleBridgeFactoryInterface, QAccessibleBridgeFactoryInterface_iid) Q_DECLARE_INTERFACE(QAccessibleBridgeFactoryInterface, QAccessibleBridgeFactoryInterface_iid)
class Q_GUI_EXPORT QAccessibleBridgePlugin : public QObject, public QAccessibleBridgeFactoryInterface class Q_WIDGETS_EXPORT QAccessibleBridgePlugin : public QObject, public QAccessibleBridgeFactoryInterface
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(QAccessibleBridgeFactoryInterface:QFactoryInterface) Q_INTERFACES(QAccessibleBridgeFactoryInterface:QFactoryInterface)

6
src/widgets/accessible/qaccessibleobject.h
View File

@ -55,7 +55,7 @@ QT_MODULE(Gui)
class QAccessibleObjectPrivate; class QAccessibleObjectPrivate;
class QObject; class QObject;
class Q_GUI_EXPORT QAccessibleObject : public QAccessibleInterface class Q_WIDGETS_EXPORT QAccessibleObject : public QAccessibleInterface
{ {
public: public:
explicit QAccessibleObject(QObject *object); explicit QAccessibleObject(QObject *object);
@ -81,7 +81,7 @@ private:
Q_DISABLE_COPY(QAccessibleObject) Q_DISABLE_COPY(QAccessibleObject)
}; };
class Q_GUI_EXPORT QAccessibleObjectEx : public QAccessibleInterfaceEx class Q_WIDGETS_EXPORT QAccessibleObjectEx : public QAccessibleInterfaceEx
{ {
public: public:
explicit QAccessibleObjectEx(QObject *object); explicit QAccessibleObjectEx(QObject *object);
@ -106,7 +106,7 @@ private:
Q_DISABLE_COPY(QAccessibleObjectEx) Q_DISABLE_COPY(QAccessibleObjectEx)
}; };
class Q_GUI_EXPORT QAccessibleApplication : public QAccessibleObject class Q_WIDGETS_EXPORT QAccessibleApplication : public QAccessibleObject
{ {
public: public:
QAccessibleApplication(); QAccessibleApplication();

4
src/widgets/accessible/qaccessibleplugin.h
View File

@ -56,7 +56,7 @@ QT_MODULE(Gui)
class QStringList; class QStringList;
class QAccessibleInterface; class QAccessibleInterface;
struct Q_GUI_EXPORT QAccessibleFactoryInterface : public QAccessible, public QFactoryInterface struct Q_WIDGETS_EXPORT QAccessibleFactoryInterface : public QAccessible, public QFactoryInterface
{ {
virtual QAccessibleInterface* create(const QString &key, QObject *object) = 0; virtual QAccessibleInterface* create(const QString &key, QObject *object) = 0;
}; };
@ -66,7 +66,7 @@ Q_DECLARE_INTERFACE(QAccessibleFactoryInterface, QAccessibleFactoryInterface_iid
class QAccessiblePluginPrivate; class QAccessiblePluginPrivate;
class Q_GUI_EXPORT QAccessiblePlugin : public QObject, public QAccessibleFactoryInterface class Q_WIDGETS_EXPORT QAccessiblePlugin : public QObject, public QAccessibleFactoryInterface
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(QAccessibleFactoryInterface:QFactoryInterface) Q_INTERFACES(QAccessibleFactoryInterface:QFactoryInterface)

4
src/widgets/accessible/qaccessiblewidget.cpp
View File

@ -100,12 +100,12 @@ static QString buddyString(const QWidget *widget)
return QString(); return QString();
} }
QString Q_GUI_EXPORT qt_accStripAmp(const QString &text) QString Q_WIDGETS_EXPORT qt_accStripAmp(const QString &text)
{ {
return QString(text).remove(QLatin1Char('&')); return QString(text).remove(QLatin1Char('&'));
} }
QString Q_GUI_EXPORT qt_accHotKey(const QString &text) QString Q_WIDGETS_EXPORT qt_accHotKey(const QString &text)
{ {
#ifndef QT_NO_SHORTCUT #ifndef QT_NO_SHORTCUT
if (text.isEmpty()) if (text.isEmpty())

4
src/widgets/accessible/qaccessiblewidget.h
View File

@ -54,7 +54,7 @@ QT_MODULE(Gui)
class QAccessibleWidgetPrivate; class QAccessibleWidgetPrivate;
class Q_GUI_EXPORT QAccessibleWidget : public QAccessibleObject class Q_WIDGETS_EXPORT QAccessibleWidget : public QAccessibleObject
{ {
public: public:
explicit QAccessibleWidget(QWidget *o, Role r = Client, const QString& name = QString()); explicit QAccessibleWidget(QWidget *o, Role r = Client, const QString& name = QString());
@ -94,7 +94,7 @@ private:
Q_DISABLE_COPY(QAccessibleWidget) Q_DISABLE_COPY(QAccessibleWidget)
}; };
class Q_GUI_EXPORT QAccessibleWidgetEx : public QAccessibleObjectEx class Q_WIDGETS_EXPORT QAccessibleWidgetEx : public QAccessibleObjectEx
{ {
public: public:
explicit QAccessibleWidgetEx(QWidget *o, Role r = Client, const QString& name = QString()); explicit QAccessibleWidgetEx(QWidget *o, Role r = Client, const QString& name = QString());

2
src/widgets/dialogs/qabstractpagesetupdialog.h
View File

@ -56,7 +56,7 @@ class QAbstractPageSetupDialogPrivate;
class QPrinter; class QPrinter;
// ### Qt 5: Remove this class // ### Qt 5: Remove this class
class Q_GUI_EXPORT QAbstractPageSetupDialog : public QDialog class Q_WIDGETS_EXPORT QAbstractPageSetupDialog : public QDialog
{ {
Q_DECLARE_PRIVATE(QAbstractPageSetupDialog) Q_DECLARE_PRIVATE(QAbstractPageSetupDialog)
Q_OBJECT Q_OBJECT

2
src/widgets/dialogs/qabstractprintdialog.h
View File

@ -56,7 +56,7 @@ class QAbstractPrintDialogPrivate;
class QPrinter; class QPrinter;
// ### Qt 5: remove this class // ### Qt 5: remove this class
class Q_GUI_EXPORT QAbstractPrintDialog : public QDialog class Q_WIDGETS_EXPORT QAbstractPrintDialog : public QDialog
{ {
Q_DECLARE_PRIVATE(QAbstractPrintDialog) Q_DECLARE_PRIVATE(QAbstractPrintDialog)
Q_OBJECT Q_OBJECT

2
src/widgets/dialogs/qcolordialog.h
View File

@ -54,7 +54,7 @@ QT_MODULE(Gui)
class QColorDialogPrivate; class QColorDialogPrivate;
class Q_GUI_EXPORT QColorDialog : public QDialog class Q_WIDGETS_EXPORT QColorDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QColorDialog) Q_DECLARE_PRIVATE(QColorDialog)

2
src/widgets/dialogs/qdialog.h
View File

@ -53,7 +53,7 @@ QT_MODULE(Gui)
class QPushButton; class QPushButton;
class QDialogPrivate; class QDialogPrivate;
class Q_GUI_EXPORT QDialog : public QWidget class Q_WIDGETS_EXPORT QDialog : public QWidget
{ {
Q_OBJECT Q_OBJECT
friend class QPushButton; friend class QPushButton;

6
src/widgets/dialogs/qdialogsbinarycompat_win.cpp
View File

@ -69,7 +69,7 @@ class QFontDialogPrivate;
class QInputDialogPrivate; class QInputDialogPrivate;
class QWidget; class QWidget;
class Q_GUI_EXPORT QColorDialog class Q_WIDGETS_EXPORT QColorDialog
{ {
private: private:
explicit QColorDialog(QWidget *, bool); explicit QColorDialog(QWidget *, bool);
@ -92,7 +92,7 @@ bool QColorDialog::selectColor(const QColor &) { return false; }
void QColorDialog::setSelectedAlpha(int) {} void QColorDialog::setSelectedAlpha(int) {}
int QColorDialog::selectedAlpha() const { return 0; } int QColorDialog::selectedAlpha() const { return 0; }
class Q_GUI_EXPORT QFontDialog class Q_WIDGETS_EXPORT QFontDialog
{ {
private: private:
explicit QFontDialog(QWidget *, bool, Qt::WindowFlags); explicit QFontDialog(QWidget *, bool, Qt::WindowFlags);
@ -118,7 +118,7 @@ void QFontDialog::updateStyles() {}
void QFontDialog::updateSizes() {} void QFontDialog::updateSizes() {}
QFont QFontDialog::getFont(bool *, const QFont *, QWidget *) { return QFont(); } QFont QFontDialog::getFont(bool *, const QFont *, QWidget *) { return QFont(); }
class Q_GUI_EXPORT QInputDialog class Q_WIDGETS_EXPORT QInputDialog
{ {
private: private:
enum Type { LineEdit, SpinBox, DoubleSpinBox, ComboBox, EditableComboBox }; enum Type { LineEdit, SpinBox, DoubleSpinBox, ComboBox, EditableComboBox };

2
src/widgets/dialogs/qerrormessage.h
View File

@ -54,7 +54,7 @@ QT_MODULE(Gui)
class QErrorMessagePrivate; class QErrorMessagePrivate;
class Q_GUI_EXPORT QErrorMessage: public QDialog class Q_WIDGETS_EXPORT QErrorMessage: public QDialog
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QErrorMessage) Q_DECLARE_PRIVATE(QErrorMessage)

10
src/widgets/dialogs/qfiledialog.cpp
View File

@ -78,16 +78,16 @@ Q_GLOBAL_STATIC(QString, lastVisitedDir)
Exported hooks that can be used to customize the static functions. 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); 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); 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); 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); 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 \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) #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 #endif
QT_BEGIN_INCLUDE_NAMESPACE QT_BEGIN_INCLUDE_NAMESPACE

2
src/widgets/dialogs/qfiledialog.h
View File

@ -63,7 +63,7 @@ class QAbstractItemDelegate;
class QAbstractProxyModel; class QAbstractProxyModel;
class QUrl; class QUrl;
class Q_GUI_EXPORT QFileDialog : public QDialog class Q_WIDGETS_EXPORT QFileDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
Q_ENUMS(ViewMode FileMode AcceptMode Option) Q_ENUMS(ViewMode FileMode AcceptMode Option)

2
src/widgets/dialogs/qfilesystemmodel.h
View File

@ -60,7 +60,7 @@ class ExtendedInformation;
class QFileSystemModelPrivate; class QFileSystemModelPrivate;
class QFileIconProvider; class QFileIconProvider;
class Q_GUI_EXPORT QFileSystemModel : public QAbstractItemModel class Q_WIDGETS_EXPORT QFileSystemModel : public QAbstractItemModel
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks) Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks)

2
src/widgets/dialogs/qfontdialog.h
View File

@ -56,7 +56,7 @@ QT_MODULE(Gui)
class QFontDialogPrivate; class QFontDialogPrivate;
class Q_GUI_EXPORT QFontDialog : public QDialog class Q_WIDGETS_EXPORT QFontDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QFontDialog) Q_DECLARE_PRIVATE(QFontDialog)

2
src/widgets/dialogs/qinputdialog.h
View File

@ -56,7 +56,7 @@ QT_MODULE(Gui)
class QInputDialogPrivate; class QInputDialogPrivate;
class Q_GUI_EXPORT QInputDialog : public QDialog class Q_WIDGETS_EXPORT QInputDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QInputDialog) Q_DECLARE_PRIVATE(QInputDialog)

2
src/widgets/dialogs/qmessagebox.h
View File

@ -56,7 +56,7 @@ class QLabel;
class QMessageBoxPrivate; class QMessageBoxPrivate;
class QAbstractButton; class QAbstractButton;
class Q_GUI_EXPORT QMessageBox : public QDialog class Q_WIDGETS_EXPORT QMessageBox : public QDialog
{ {
Q_OBJECT Q_OBJECT
Q_ENUMS(Icon) Q_ENUMS(Icon)

2
src/widgets/dialogs/qpagesetupdialog.h
View File

@ -54,7 +54,7 @@ QT_MODULE(Gui)
class QPageSetupDialogPrivate; class QPageSetupDialogPrivate;
class Q_GUI_EXPORT QPageSetupDialog : public QAbstractPageSetupDialog class Q_WIDGETS_EXPORT QPageSetupDialog : public QAbstractPageSetupDialog
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QPageSetupDialog) Q_DECLARE_PRIVATE(QPageSetupDialog)

4
src/widgets/dialogs/qprintdialog.h
View File

@ -59,7 +59,7 @@ class QPrinter;
#if defined (Q_OS_UNIX) && !defined(QTOPIA_PRINTDIALOG) && !defined(Q_WS_MAC) && !defined(Q_OS_SYMBIAN) #if defined (Q_OS_UNIX) && !defined(QTOPIA_PRINTDIALOG) && !defined(Q_WS_MAC) && !defined(Q_OS_SYMBIAN)
class QUnixPrintWidgetPrivate; class QUnixPrintWidgetPrivate;
class Q_GUI_EXPORT QUnixPrintWidget : public QWidget class Q_WIDGETS_EXPORT QUnixPrintWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
@ -78,7 +78,7 @@ private:
}; };
#endif #endif
class Q_GUI_EXPORT QPrintDialog : public QAbstractPrintDialog class Q_WIDGETS_EXPORT QPrintDialog : public QAbstractPrintDialog
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QPrintDialog) Q_DECLARE_PRIVATE(QPrintDialog)

2
src/widgets/dialogs/qprintpreviewdialog.h
View File

@ -55,7 +55,7 @@ QT_MODULE(Gui)
class QGraphicsView; class QGraphicsView;
class QPrintPreviewDialogPrivate; class QPrintPreviewDialogPrivate;
class Q_GUI_EXPORT QPrintPreviewDialog : public QDialog class Q_WIDGETS_EXPORT QPrintPreviewDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QPrintPreviewDialog) Q_DECLARE_PRIVATE(QPrintPreviewDialog)

2
src/widgets/dialogs/qprogressdialog.h
View File

@ -58,7 +58,7 @@ class QProgressBar;
class QTimer; class QTimer;
class QProgressDialogPrivate; class QProgressDialogPrivate;
class Q_GUI_EXPORT QProgressDialog : public QDialog class Q_WIDGETS_EXPORT QProgressDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QProgressDialog) Q_DECLARE_PRIVATE(QProgressDialog)

4
src/widgets/dialogs/qwizard.h
View File

@ -56,7 +56,7 @@ class QAbstractButton;
class QWizardPage; class QWizardPage;
class QWizardPrivate; class QWizardPrivate;
class Q_GUI_EXPORT QWizard : public QDialog class Q_WIDGETS_EXPORT QWizard : public QDialog
{ {
Q_OBJECT Q_OBJECT
Q_ENUMS(WizardStyle WizardOption) Q_ENUMS(WizardStyle WizardOption)
@ -211,7 +211,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QWizard::WizardOptions)
class QWizardPagePrivate; class QWizardPagePrivate;
class Q_GUI_EXPORT QWizardPage : public QWidget class Q_WIDGETS_EXPORT QWizardPage : public QWidget
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString title READ title WRITE setTitle) Q_PROPERTY(QString title READ title WRITE setTitle)

10
src/widgets/effects/qgraphicseffect.h
View File

@ -63,7 +63,7 @@ class QPixmap;
class QGraphicsEffectSource; class QGraphicsEffectSource;
class QGraphicsEffectPrivate; class QGraphicsEffectPrivate;
class Q_GUI_EXPORT QGraphicsEffect : public QObject class Q_WIDGETS_EXPORT QGraphicsEffect : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_FLAGS(ChangeFlags) Q_FLAGS(ChangeFlags)
@ -127,7 +127,7 @@ public:
Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsEffect::ChangeFlags) Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsEffect::ChangeFlags)
class QGraphicsColorizeEffectPrivate; class QGraphicsColorizeEffectPrivate;
class Q_GUI_EXPORT QGraphicsColorizeEffect: public QGraphicsEffect class Q_WIDGETS_EXPORT QGraphicsColorizeEffect: public QGraphicsEffect
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
@ -156,7 +156,7 @@ private:
}; };
class QGraphicsBlurEffectPrivate; class QGraphicsBlurEffectPrivate;
class Q_GUI_EXPORT QGraphicsBlurEffect: public QGraphicsEffect class Q_WIDGETS_EXPORT QGraphicsBlurEffect: public QGraphicsEffect
{ {
Q_OBJECT Q_OBJECT
Q_FLAGS(BlurHint BlurHints) Q_FLAGS(BlurHint BlurHints)
@ -196,7 +196,7 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsBlurEffect::BlurHints) Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsBlurEffect::BlurHints)
class QGraphicsDropShadowEffectPrivate; class QGraphicsDropShadowEffectPrivate;
class Q_GUI_EXPORT QGraphicsDropShadowEffect: public QGraphicsEffect class Q_WIDGETS_EXPORT QGraphicsDropShadowEffect: public QGraphicsEffect
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QPointF offset READ offset WRITE setOffset NOTIFY offsetChanged) Q_PROPERTY(QPointF offset READ offset WRITE setOffset NOTIFY offsetChanged)
@ -252,7 +252,7 @@ private:
}; };
class QGraphicsOpacityEffectPrivate; class QGraphicsOpacityEffectPrivate;
class Q_GUI_EXPORT QGraphicsOpacityEffect: public QGraphicsEffect class Q_WIDGETS_EXPORT QGraphicsOpacityEffect: public QGraphicsEffect
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged) Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)

4
src/widgets/effects/qgraphicseffect_p.h
View File

@ -64,7 +64,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QGraphicsEffectSourcePrivate; class QGraphicsEffectSourcePrivate;
class Q_GUI_EXPORT QGraphicsEffectSource : public QObject class Q_WIDGETS_EXPORT QGraphicsEffectSource : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -145,7 +145,7 @@ private:
mutable QPixmapCache::Key m_cacheKey; mutable QPixmapCache::Key m_cacheKey;
}; };
class Q_GUI_EXPORT QGraphicsEffectPrivate : public QObjectPrivate class Q_WIDGETS_EXPORT QGraphicsEffectPrivate : public QObjectPrivate
{ {
Q_DECLARE_PUBLIC(QGraphicsEffect) Q_DECLARE_PUBLIC(QGraphicsEffect)
public: public:

8
src/widgets/effects/qpixmapfilter.cpp
View File

@ -781,7 +781,7 @@ void expblur(QImage &img, qreal radius, bool improvedQuality = false, int transp
#define AVG(a,b) ( ((((a)^(b)) & 0xfefefefeUL) >> 1) + ((a)&(b)) ) #define AVG(a,b) ( ((((a)^(b)) & 0xfefefefeUL) >> 1) + ((a)&(b)) )
#define AVG16(a,b) ( ((((a)^(b)) & 0xf7deUL) >> 1) + ((a)&(b)) ) #define AVG16(a,b) ( ((((a)^(b)) & 0xf7deUL) >> 1) + ((a)&(b)) )
Q_GUI_EXPORT QImage qt_halfScaled(const QImage &source) Q_WIDGETS_EXPORT QImage qt_halfScaled(const QImage &source)
{ {
if (source.width() < 2 || source.height() < 2) if (source.width() < 2 || source.height() < 2)
return QImage(); return QImage();
@ -869,7 +869,7 @@ Q_GUI_EXPORT QImage qt_halfScaled(const QImage &source)
return dest; return dest;
} }
Q_GUI_EXPORT void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, bool quality, bool alphaOnly, int transposed = 0) Q_WIDGETS_EXPORT void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, bool quality, bool alphaOnly, int transposed = 0)
{ {
if (blurImage.format() != QImage::Format_ARGB32_Premultiplied if (blurImage.format() != QImage::Format_ARGB32_Premultiplied
&& blurImage.format() != QImage::Format_RGB32) && blurImage.format() != QImage::Format_RGB32)
@ -896,7 +896,7 @@ Q_GUI_EXPORT void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, boo
} }
} }
Q_GUI_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed = 0) Q_WIDGETS_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed = 0)
{ {
if (blurImage.format() == QImage::Format_Indexed8) if (blurImage.format() == QImage::Format_Indexed8)
expblur<12, 10, true>(blurImage, radius, quality, transposed); expblur<12, 10, true>(blurImage, radius, quality, transposed);
@ -904,7 +904,7 @@ Q_GUI_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, in
expblur<12, 10, false>(blurImage, radius, quality, transposed); expblur<12, 10, false>(blurImage, radius, quality, transposed);
} }
Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); Q_WIDGETS_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale);
/*! /*!
\internal \internal

10
src/widgets/effects/qpixmapfilter_p.h
View File

@ -69,7 +69,7 @@ class QPixmapData;
class QPixmapFilterPrivate; class QPixmapFilterPrivate;
class Q_GUI_EXPORT QPixmapFilter : public QObject class Q_WIDGETS_EXPORT QPixmapFilter : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QPixmapFilter) Q_DECLARE_PRIVATE(QPixmapFilter)
@ -98,7 +98,7 @@ protected:
class QPixmapConvolutionFilterPrivate; class QPixmapConvolutionFilterPrivate;
class Q_GUI_EXPORT QPixmapConvolutionFilter : public QPixmapFilter class Q_WIDGETS_EXPORT QPixmapConvolutionFilter : public QPixmapFilter
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QPixmapConvolutionFilter) Q_DECLARE_PRIVATE(QPixmapConvolutionFilter)
@ -122,7 +122,7 @@ private:
class QPixmapBlurFilterPrivate; class QPixmapBlurFilterPrivate;
class Q_GUI_EXPORT QPixmapBlurFilter : public QPixmapFilter class Q_WIDGETS_EXPORT QPixmapBlurFilter : public QPixmapFilter
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QPixmapBlurFilter) Q_DECLARE_PRIVATE(QPixmapBlurFilter)
@ -146,7 +146,7 @@ private:
class QPixmapColorizeFilterPrivate; class QPixmapColorizeFilterPrivate;
class Q_GUI_EXPORT QPixmapColorizeFilter : public QPixmapFilter class Q_WIDGETS_EXPORT QPixmapColorizeFilter : public QPixmapFilter
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QPixmapColorizeFilter) Q_DECLARE_PRIVATE(QPixmapColorizeFilter)
@ -165,7 +165,7 @@ public:
class QPixmapDropShadowFilterPrivate; class QPixmapDropShadowFilterPrivate;
class Q_GUI_EXPORT QPixmapDropShadowFilter : public QPixmapFilter class Q_WIDGETS_EXPORT QPixmapDropShadowFilter : public QPixmapFilter
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QPixmapDropShadowFilter) Q_DECLARE_PRIVATE(QPixmapDropShadowFilter)

4
src/widgets/graphicsview/qgraphicsanchorlayout.h
View File

@ -58,7 +58,7 @@ class QGraphicsAnchorPrivate;
class QGraphicsAnchorLayout; class QGraphicsAnchorLayout;
class QGraphicsAnchorLayoutPrivate; class QGraphicsAnchorLayoutPrivate;
class Q_GUI_EXPORT QGraphicsAnchor : public QObject class Q_WIDGETS_EXPORT QGraphicsAnchor : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET unsetSpacing) Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET unsetSpacing)
@ -79,7 +79,7 @@ private:
friend struct AnchorData; friend struct AnchorData;
}; };
class Q_GUI_EXPORT QGraphicsAnchorLayout : public QGraphicsLayout class Q_WIDGETS_EXPORT QGraphicsAnchorLayout : public QGraphicsLayout
{ {
public: public:
QGraphicsAnchorLayout(QGraphicsLayoutItem *parent = 0); QGraphicsAnchorLayout(QGraphicsLayoutItem *parent = 0);

2
src/widgets/graphicsview/qgraphicsgridlayout.h
View File

@ -55,7 +55,7 @@ QT_MODULE(Gui)
class QGraphicsGridLayoutPrivate; class QGraphicsGridLayoutPrivate;
class Q_GUI_EXPORT QGraphicsGridLayout : public QGraphicsLayout class Q_WIDGETS_EXPORT QGraphicsGridLayout : public QGraphicsLayout
{ {
public: public:
QGraphicsGridLayout(QGraphicsLayoutItem *parent = 0); QGraphicsGridLayout(QGraphicsLayoutItem *parent = 0);

34
src/widgets/graphicsview/qgraphicsitem.h
View File

@ -86,7 +86,7 @@ class QRectF;
class QStyleOptionGraphicsItem; class QStyleOptionGraphicsItem;
class QGraphicsItemPrivate; class QGraphicsItemPrivate;
class Q_GUI_EXPORT QGraphicsItem class Q_WIDGETS_EXPORT QGraphicsItem
{ {
public: public:
enum GraphicsItemFlag { enum GraphicsItemFlag {
@ -544,7 +544,7 @@ inline QRectF QGraphicsItem::mapRectFromScene(qreal ax, qreal ay, qreal w, qreal
{ return mapRectFromScene(QRectF(ax, ay, w, h)); } { return mapRectFromScene(QRectF(ax, ay, w, h)); }
class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem class Q_WIDGETS_EXPORT QGraphicsObject : public QObject, public QGraphicsItem
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QGraphicsObject * parent READ parentObject WRITE setParentItem NOTIFY parentChanged DESIGNABLE false) Q_PROPERTY(QGraphicsObject * parent READ parentObject WRITE setParentItem NOTIFY parentChanged DESIGNABLE false)
@ -607,7 +607,7 @@ private:
class QAbstractGraphicsShapeItemPrivate; class QAbstractGraphicsShapeItemPrivate;
class Q_GUI_EXPORT QAbstractGraphicsShapeItem : public QGraphicsItem class Q_WIDGETS_EXPORT QAbstractGraphicsShapeItem : public QGraphicsItem
{ {
public: public:
QAbstractGraphicsShapeItem(QGraphicsItem *parent = 0 QAbstractGraphicsShapeItem(QGraphicsItem *parent = 0
@ -637,7 +637,7 @@ private:
}; };
class QGraphicsPathItemPrivate; class QGraphicsPathItemPrivate;
class Q_GUI_EXPORT QGraphicsPathItem : public QAbstractGraphicsShapeItem class Q_WIDGETS_EXPORT QGraphicsPathItem : public QAbstractGraphicsShapeItem
{ {
public: public:
QGraphicsPathItem(QGraphicsItem *parent = 0 QGraphicsPathItem(QGraphicsItem *parent = 0
@ -680,7 +680,7 @@ private:
}; };
class QGraphicsRectItemPrivate; class QGraphicsRectItemPrivate;
class Q_GUI_EXPORT QGraphicsRectItem : public QAbstractGraphicsShapeItem class Q_WIDGETS_EXPORT QGraphicsRectItem : public QAbstractGraphicsShapeItem
{ {
public: public:
QGraphicsRectItem(QGraphicsItem *parent = 0 QGraphicsRectItem(QGraphicsItem *parent = 0
@ -733,7 +733,7 @@ inline void QGraphicsRectItem::setRect(qreal ax, qreal ay, qreal w, qreal h)
{ setRect(QRectF(ax, ay, w, h)); } { setRect(QRectF(ax, ay, w, h)); }
class QGraphicsEllipseItemPrivate; class QGraphicsEllipseItemPrivate;
class Q_GUI_EXPORT QGraphicsEllipseItem : public QAbstractGraphicsShapeItem class Q_WIDGETS_EXPORT QGraphicsEllipseItem : public QAbstractGraphicsShapeItem
{ {
public: public:
QGraphicsEllipseItem(QGraphicsItem *parent = 0 QGraphicsEllipseItem(QGraphicsItem *parent = 0
@ -792,7 +792,7 @@ inline void QGraphicsEllipseItem::setRect(qreal ax, qreal ay, qreal w, qreal h)
{ setRect(QRectF(ax, ay, w, h)); } { setRect(QRectF(ax, ay, w, h)); }
class QGraphicsPolygonItemPrivate; class QGraphicsPolygonItemPrivate;
class Q_GUI_EXPORT QGraphicsPolygonItem : public QAbstractGraphicsShapeItem class Q_WIDGETS_EXPORT QGraphicsPolygonItem : public QAbstractGraphicsShapeItem
{ {
public: public:
QGraphicsPolygonItem(QGraphicsItem *parent = 0 QGraphicsPolygonItem(QGraphicsItem *parent = 0
@ -839,7 +839,7 @@ private:
}; };
class QGraphicsLineItemPrivate; class QGraphicsLineItemPrivate;
class Q_GUI_EXPORT QGraphicsLineItem : public QGraphicsItem class Q_WIDGETS_EXPORT QGraphicsLineItem : public QGraphicsItem
{ {
public: public:
QGraphicsLineItem(QGraphicsItem *parent = 0 QGraphicsLineItem(QGraphicsItem *parent = 0
@ -893,7 +893,7 @@ private:
}; };
class QGraphicsPixmapItemPrivate; class QGraphicsPixmapItemPrivate;
class Q_GUI_EXPORT QGraphicsPixmapItem : public QGraphicsItem class Q_WIDGETS_EXPORT QGraphicsPixmapItem : public QGraphicsItem
{ {
public: public:
enum ShapeMode { enum ShapeMode {
@ -957,7 +957,7 @@ inline void QGraphicsPixmapItem::setOffset(qreal ax, qreal ay)
class QGraphicsTextItemPrivate; class QGraphicsTextItemPrivate;
class QTextDocument; class QTextDocument;
class QTextCursor; class QTextCursor;
class Q_GUI_EXPORT QGraphicsTextItem : public QGraphicsObject class Q_WIDGETS_EXPORT QGraphicsTextItem : public QGraphicsObject
{ {
Q_OBJECT Q_OBJECT
QDOC_PROPERTY(bool openExternalLinks READ openExternalLinks WRITE setOpenExternalLinks) QDOC_PROPERTY(bool openExternalLinks READ openExternalLinks WRITE setOpenExternalLinks)
@ -1062,7 +1062,7 @@ private:
}; };
class QGraphicsSimpleTextItemPrivate; class QGraphicsSimpleTextItemPrivate;
class Q_GUI_EXPORT QGraphicsSimpleTextItem : public QAbstractGraphicsShapeItem class Q_WIDGETS_EXPORT QGraphicsSimpleTextItem : public QAbstractGraphicsShapeItem
{ {
public: public:
QGraphicsSimpleTextItem(QGraphicsItem *parent = 0 QGraphicsSimpleTextItem(QGraphicsItem *parent = 0
@ -1108,7 +1108,7 @@ private:
}; };
class QGraphicsItemGroupPrivate; class QGraphicsItemGroupPrivate;
class Q_GUI_EXPORT QGraphicsItemGroup : public QGraphicsItem class Q_WIDGETS_EXPORT QGraphicsItemGroup : public QGraphicsItem
{ {
public: public:
QGraphicsItemGroup(QGraphicsItem *parent = 0 QGraphicsItemGroup(QGraphicsItem *parent = 0
@ -1149,11 +1149,11 @@ template <class T> inline T qgraphicsitem_cast(const QGraphicsItem *item)
} }
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem *item); Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem *item);
Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsObject *item); Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsObject *item);
Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemChange change); Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemChange change);
Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlag flag); Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlag flag);
Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlags flags); Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlags flags);
#endif #endif
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/widgets/graphicsview/qgraphicsitem_p.h
View File

@ -155,7 +155,7 @@ public:
void purge(); void purge();
}; };
class Q_GUI_EXPORT QGraphicsItemPrivate class Q_WIDGETS_EXPORT QGraphicsItemPrivate
{ {
Q_DECLARE_PUBLIC(QGraphicsItem) Q_DECLARE_PUBLIC(QGraphicsItem)
public: public:

2
src/widgets/graphicsview/qgraphicsitemanimation.h
View File

@ -59,7 +59,7 @@ class QTimeLine;
template <class T1, class T2> struct QPair; template <class T1, class T2> struct QPair;
class QGraphicsItemAnimationPrivate; class QGraphicsItemAnimationPrivate;
class Q_GUI_EXPORT QGraphicsItemAnimation : public QObject class Q_WIDGETS_EXPORT QGraphicsItemAnimation : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:

2
src/widgets/graphicsview/qgraphicslayout.h
View File

@ -56,7 +56,7 @@ class QGraphicsLayoutPrivate;
class QGraphicsLayoutItem; class QGraphicsLayoutItem;
class QGraphicsWidget; class QGraphicsWidget;
class Q_GUI_EXPORT QGraphicsLayout : public QGraphicsLayoutItem class Q_WIDGETS_EXPORT QGraphicsLayout : public QGraphicsLayoutItem
{ {
public: public:
QGraphicsLayout(QGraphicsLayoutItem *parent = 0); QGraphicsLayout(QGraphicsLayoutItem *parent = 0);

2
src/widgets/graphicsview/qgraphicslayoutitem.h
View File

@ -56,7 +56,7 @@ QT_MODULE(Gui)
class QGraphicsLayoutItemPrivate; class QGraphicsLayoutItemPrivate;
class QGraphicsItem; class QGraphicsItem;
class Q_GUI_EXPORT QGraphicsLayoutItem class Q_WIDGETS_EXPORT QGraphicsLayoutItem
{ {
public: public:
QGraphicsLayoutItem(QGraphicsLayoutItem *parent = 0, bool isLayout = false); QGraphicsLayoutItem(QGraphicsLayoutItem *parent = 0, bool isLayout = false);

2
src/widgets/graphicsview/qgraphicslinearlayout.h
View File

@ -55,7 +55,7 @@ QT_MODULE(Gui)
class QGraphicsLinearLayoutPrivate; class QGraphicsLinearLayoutPrivate;
class Q_GUI_EXPORT QGraphicsLinearLayout : public QGraphicsLayout class Q_WIDGETS_EXPORT QGraphicsLinearLayout : public QGraphicsLayout
{ {
public: public:
QGraphicsLinearLayout(QGraphicsLayoutItem *parent = 0); QGraphicsLinearLayout(QGraphicsLayoutItem *parent = 0);

2
src/widgets/graphicsview/qgraphicsproxywidget.cpp
View File

@ -189,7 +189,7 @@ QT_BEGIN_NAMESPACE
*/ */
extern bool qt_sendSpontaneousEvent(QObject *, QEvent *); extern bool qt_sendSpontaneousEvent(QObject *, QEvent *);
Q_GUI_EXPORT extern bool qt_tab_all_widgets; Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets;
/*! /*!
\internal \internal

2
src/widgets/graphicsview/qgraphicsproxywidget.h
View File

@ -54,7 +54,7 @@ QT_MODULE(Gui)
class QGraphicsProxyWidgetPrivate; class QGraphicsProxyWidgetPrivate;
class Q_GUI_EXPORT QGraphicsProxyWidget : public QGraphicsWidget class Q_WIDGETS_EXPORT QGraphicsProxyWidget : public QGraphicsWidget
{ {
Q_OBJECT Q_OBJECT
public: public:

2
src/widgets/graphicsview/qgraphicsscene.h
View File

@ -98,7 +98,7 @@ class QStyle;
class QStyleOptionGraphicsItem; class QStyleOptionGraphicsItem;
class QGraphicsScenePrivate; class QGraphicsScenePrivate;
class Q_GUI_EXPORT QGraphicsScene : public QObject class Q_WIDGETS_EXPORT QGraphicsScene : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QBrush backgroundBrush READ backgroundBrush WRITE setBackgroundBrush) Q_PROPERTY(QBrush backgroundBrush READ backgroundBrush WRITE setBackgroundBrush)

18
src/widgets/graphicsview/qgraphicssceneevent.h
View File

@ -64,7 +64,7 @@ class QSizeF;
class QWidget; class QWidget;
class QGraphicsSceneEventPrivate; class QGraphicsSceneEventPrivate;
class Q_GUI_EXPORT QGraphicsSceneEvent : public QEvent class Q_WIDGETS_EXPORT QGraphicsSceneEvent : public QEvent
{ {
public: public:
QGraphicsSceneEvent(Type type); QGraphicsSceneEvent(Type type);
@ -82,7 +82,7 @@ private:
}; };
class QGraphicsSceneMouseEventPrivate; class QGraphicsSceneMouseEventPrivate;
class Q_GUI_EXPORT QGraphicsSceneMouseEvent : public QGraphicsSceneEvent class Q_WIDGETS_EXPORT QGraphicsSceneMouseEvent : public QGraphicsSceneEvent
{ {
public: public:
QGraphicsSceneMouseEvent(Type type = None); QGraphicsSceneMouseEvent(Type type = None);
@ -130,7 +130,7 @@ private:
}; };
class QGraphicsSceneWheelEventPrivate; class QGraphicsSceneWheelEventPrivate;
class Q_GUI_EXPORT QGraphicsSceneWheelEvent : public QGraphicsSceneEvent class Q_WIDGETS_EXPORT QGraphicsSceneWheelEvent : public QGraphicsSceneEvent
{ {
public: public:
QGraphicsSceneWheelEvent(Type type = None); QGraphicsSceneWheelEvent(Type type = None);
@ -163,7 +163,7 @@ private:
}; };
class QGraphicsSceneContextMenuEventPrivate; class QGraphicsSceneContextMenuEventPrivate;
class Q_GUI_EXPORT QGraphicsSceneContextMenuEvent : public QGraphicsSceneEvent class Q_WIDGETS_EXPORT QGraphicsSceneContextMenuEvent : public QGraphicsSceneEvent
{ {
public: public:
enum Reason { Mouse, Keyboard, Other }; enum Reason { Mouse, Keyboard, Other };
@ -192,7 +192,7 @@ private:
}; };
class QGraphicsSceneHoverEventPrivate; class QGraphicsSceneHoverEventPrivate;
class Q_GUI_EXPORT QGraphicsSceneHoverEvent : public QGraphicsSceneEvent class Q_WIDGETS_EXPORT QGraphicsSceneHoverEvent : public QGraphicsSceneEvent
{ {
public: public:
QGraphicsSceneHoverEvent(Type type = None); QGraphicsSceneHoverEvent(Type type = None);
@ -225,7 +225,7 @@ private:
}; };
class QGraphicsSceneHelpEventPrivate; class QGraphicsSceneHelpEventPrivate;
class Q_GUI_EXPORT QGraphicsSceneHelpEvent : public QGraphicsSceneEvent class Q_WIDGETS_EXPORT QGraphicsSceneHelpEvent : public QGraphicsSceneEvent
{ {
public: public:
QGraphicsSceneHelpEvent(Type type = None); QGraphicsSceneHelpEvent(Type type = None);
@ -243,7 +243,7 @@ private:
}; };
class QGraphicsSceneDragDropEventPrivate; class QGraphicsSceneDragDropEventPrivate;
class Q_GUI_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent class Q_WIDGETS_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent
{ {
public: public:
QGraphicsSceneDragDropEvent(Type type = None); QGraphicsSceneDragDropEvent(Type type = None);
@ -286,7 +286,7 @@ private:
}; };
class QGraphicsSceneResizeEventPrivate; class QGraphicsSceneResizeEventPrivate;
class Q_GUI_EXPORT QGraphicsSceneResizeEvent : public QGraphicsSceneEvent class Q_WIDGETS_EXPORT QGraphicsSceneResizeEvent : public QGraphicsSceneEvent
{ {
Q_DECLARE_PRIVATE(QGraphicsSceneResizeEvent) Q_DECLARE_PRIVATE(QGraphicsSceneResizeEvent)
Q_DISABLE_COPY(QGraphicsSceneResizeEvent) Q_DISABLE_COPY(QGraphicsSceneResizeEvent)
@ -302,7 +302,7 @@ public:
}; };
class QGraphicsSceneMoveEventPrivate; class QGraphicsSceneMoveEventPrivate;
class Q_GUI_EXPORT QGraphicsSceneMoveEvent : public QGraphicsSceneEvent class Q_WIDGETS_EXPORT QGraphicsSceneMoveEvent : public QGraphicsSceneEvent
{ {
Q_DECLARE_PRIVATE(QGraphicsSceneMoveEvent) Q_DECLARE_PRIVATE(QGraphicsSceneMoveEvent)
Q_DISABLE_COPY(QGraphicsSceneMoveEvent) Q_DISABLE_COPY(QGraphicsSceneMoveEvent)

6
src/widgets/graphicsview/qgraphicstransform.h
View File

@ -57,7 +57,7 @@ QT_MODULE(Gui)
class QGraphicsItem; class QGraphicsItem;
class QGraphicsTransformPrivate; class QGraphicsTransformPrivate;
class Q_GUI_EXPORT QGraphicsTransform : public QObject class Q_WIDGETS_EXPORT QGraphicsTransform : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -80,7 +80,7 @@ private:
class QGraphicsScalePrivate; class QGraphicsScalePrivate;
class Q_GUI_EXPORT QGraphicsScale : public QGraphicsTransform class Q_WIDGETS_EXPORT QGraphicsScale : public QGraphicsTransform
{ {
Q_OBJECT Q_OBJECT
@ -119,7 +119,7 @@ private:
class QGraphicsRotationPrivate; class QGraphicsRotationPrivate;
class Q_GUI_EXPORT QGraphicsRotation : public QGraphicsTransform class Q_WIDGETS_EXPORT QGraphicsRotation : public QGraphicsTransform
{ {
Q_OBJECT Q_OBJECT

2
src/widgets/graphicsview/qgraphicsview.h
View File

@ -61,7 +61,7 @@ class QPolygonF;
class QStyleOptionGraphicsItem; class QStyleOptionGraphicsItem;
class QGraphicsViewPrivate; class QGraphicsViewPrivate;
class Q_GUI_EXPORT QGraphicsView : public QAbstractScrollArea class Q_WIDGETS_EXPORT QGraphicsView : public QAbstractScrollArea
{ {
Q_OBJECT Q_OBJECT
Q_FLAGS(QPainter::RenderHints CacheMode OptimizationFlags) Q_FLAGS(QPainter::RenderHints CacheMode OptimizationFlags)

2
src/widgets/graphicsview/qgraphicsview_p.h
View File

@ -66,7 +66,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class Q_GUI_EXPORT QGraphicsViewPrivate : public QAbstractScrollAreaPrivate class Q_WIDGETS_EXPORT QGraphicsViewPrivate : public QAbstractScrollAreaPrivate
{ {
Q_DECLARE_PUBLIC(QGraphicsView) Q_DECLARE_PUBLIC(QGraphicsView)
public: public:

2
src/widgets/graphicsview/qgraphicswidget.h
View File

@ -66,7 +66,7 @@ class QStyleOption;
class QGraphicsWidgetPrivate; class QGraphicsWidgetPrivate;
class Q_GUI_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLayoutItem class Q_WIDGETS_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLayoutItem
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(QGraphicsItem QGraphicsLayoutItem) Q_INTERFACES(QGraphicsItem QGraphicsLayoutItem)

2
src/widgets/inputmethod/qcoefepinputcontext_p.h
View File

@ -167,7 +167,7 @@ private:
friend class tst_QInputContext; friend class tst_QInputContext;
}; };
Q_GUI_EXPORT void qt_s60_setPartialScreenInputMode(bool enable); Q_WIDGETS_EXPORT void qt_s60_setPartialScreenInputMode(bool enable);
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/widgets/inputmethod/qcoefepinputcontext_s60.cpp
View File

@ -74,7 +74,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_GUI_EXPORT void qt_s60_setPartialScreenInputMode(bool enable) Q_WIDGETS_EXPORT void qt_s60_setPartialScreenInputMode(bool enable)
{ {
S60->partial_keyboard = enable; S60->partial_keyboard = enable;

2
src/widgets/inputmethod/qinputcontext.h
View File

@ -79,7 +79,7 @@ class QInputContextPrivate;
class QSymbianEvent; class QSymbianEvent;
#endif #endif
class Q_GUI_EXPORT QInputContext : public QObject class Q_WIDGETS_EXPORT QInputContext : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QInputContext) Q_DECLARE_PRIVATE(QInputContext)

2
src/widgets/inputmethod/qinputcontextfactory.h
View File

@ -69,7 +69,7 @@ QT_MODULE(Gui)
class QInputContext; class QInputContext;
class QWidget; class QWidget;
class Q_GUI_EXPORT QInputContextFactory class Q_WIDGETS_EXPORT QInputContextFactory
{ {
public: public:
static QStringList keys(); static QStringList keys();

4
src/widgets/inputmethod/qinputcontextplugin.h
View File

@ -71,7 +71,7 @@ QT_MODULE(Gui)
class QInputContext; class QInputContext;
class QInputContextPluginPrivate; class QInputContextPluginPrivate;
struct Q_GUI_EXPORT QInputContextFactoryInterface : public QFactoryInterface struct Q_WIDGETS_EXPORT QInputContextFactoryInterface : public QFactoryInterface
{ {
virtual QInputContext *create( const QString &key ) = 0; virtual QInputContext *create( const QString &key ) = 0;
virtual QStringList languages( const QString &key ) = 0; virtual QStringList languages( const QString &key ) = 0;
@ -82,7 +82,7 @@ struct Q_GUI_EXPORT QInputContextFactoryInterface : public QFactoryInterface
#define QInputContextFactoryInterface_iid "com.trolltech.Qt.QInputContextFactoryInterface" #define QInputContextFactoryInterface_iid "com.trolltech.Qt.QInputContextFactoryInterface"
Q_DECLARE_INTERFACE(QInputContextFactoryInterface, QInputContextFactoryInterface_iid) Q_DECLARE_INTERFACE(QInputContextFactoryInterface, QInputContextFactoryInterface_iid)
class Q_GUI_EXPORT QInputContextPlugin : public QObject, public QInputContextFactoryInterface class Q_WIDGETS_EXPORT QInputContextPlugin : public QObject, public QInputContextFactoryInterface
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(QInputContextFactoryInterface:QFactoryInterface) Q_INTERFACES(QInputContextFactoryInterface:QFactoryInterface)

2
src/widgets/inputmethod/qmacinputcontext_p.h
View File

@ -58,7 +58,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class Q_GUI_EXPORT QMacInputContext : public QInputContext class Q_WIDGETS_EXPORT QMacInputContext : public QInputContext
{ {
Q_OBJECT Q_OBJECT
//Q_DECLARE_PRIVATE(QMacInputContext) //Q_DECLARE_PRIVATE(QMacInputContext)

2
src/widgets/itemviews/qabstractitemdelegate.h
View File

@ -59,7 +59,7 @@ class QAbstractItemModel;
class QAbstractItemView; class QAbstractItemView;
class QHelpEvent; class QHelpEvent;
class Q_GUI_EXPORT QAbstractItemDelegate : public QObject class Q_WIDGETS_EXPORT QAbstractItemDelegate : public QObject
{ {
Q_OBJECT Q_OBJECT

2
src/widgets/itemviews/qabstractitemview.h
View File

@ -60,7 +60,7 @@ class QDrag;
class QEvent; class QEvent;
class QAbstractItemViewPrivate; class QAbstractItemViewPrivate;
class Q_GUI_EXPORT QAbstractItemView : public QAbstractScrollArea class Q_WIDGETS_EXPORT QAbstractItemView : public QAbstractScrollArea
{ {
Q_OBJECT Q_OBJECT
Q_ENUMS(SelectionMode SelectionBehavior ScrollHint ScrollMode DragDropMode) Q_ENUMS(SelectionMode SelectionBehavior ScrollHint ScrollMode DragDropMode)

2
src/widgets/itemviews/qabstractproxymodel.h
View File

@ -55,7 +55,7 @@ QT_MODULE(Gui)
class QAbstractProxyModelPrivate; class QAbstractProxyModelPrivate;
class QItemSelection; class QItemSelection;
class Q_GUI_EXPORT QAbstractProxyModel : public QAbstractItemModel class Q_WIDGETS_EXPORT QAbstractProxyModel : public QAbstractItemModel
{ {
Q_OBJECT Q_OBJECT

2
src/widgets/itemviews/qcolumnview.h
View File

@ -54,7 +54,7 @@ QT_MODULE(Gui)
class QColumnViewPrivate; class QColumnViewPrivate;
class Q_GUI_EXPORT QColumnView : public QAbstractItemView { class Q_WIDGETS_EXPORT QColumnView : public QAbstractItemView {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool resizeGripsVisible READ resizeGripsVisible WRITE setResizeGripsVisible) Q_PROPERTY(bool resizeGripsVisible READ resizeGripsVisible WRITE setResizeGripsVisible)

2
src/widgets/itemviews/qdatawidgetmapper.h
View File

@ -57,7 +57,7 @@ class QAbstractItemModel;
class QModelIndex; class QModelIndex;
class QDataWidgetMapperPrivate; class QDataWidgetMapperPrivate;
class Q_GUI_EXPORT QDataWidgetMapper: public QObject class Q_WIDGETS_EXPORT QDataWidgetMapper: public QObject
{ {
Q_OBJECT Q_OBJECT

2
src/widgets/itemviews/qdirmodel.h
View File

@ -56,7 +56,7 @@ QT_MODULE(Gui)
class QDirModelPrivate; class QDirModelPrivate;
class Q_GUI_EXPORT QDirModel : public QAbstractItemModel class Q_WIDGETS_EXPORT QDirModel : public QAbstractItemModel
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks) Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks)

2
src/widgets/itemviews/qfileiconprovider.h
View File

@ -56,7 +56,7 @@ QT_MODULE(Gui)
class QFileIconProviderPrivate; class QFileIconProviderPrivate;
class Q_GUI_EXPORT QFileIconProvider class Q_WIDGETS_EXPORT QFileIconProvider
{ {
public: public:
QFileIconProvider(); QFileIconProvider();

2
src/widgets/itemviews/qheaderview.h
View File

@ -55,7 +55,7 @@ QT_MODULE(Gui)
class QHeaderViewPrivate; class QHeaderViewPrivate;
class QStyleOptionHeader; class QStyleOptionHeader;
class Q_GUI_EXPORT QHeaderView : public QAbstractItemView class Q_WIDGETS_EXPORT QHeaderView : public QAbstractItemView
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool showSortIndicator READ isSortIndicatorShown WRITE setSortIndicatorShown) Q_PROPERTY(bool showSortIndicator READ isSortIndicatorShown WRITE setSortIndicatorShown)

2
src/widgets/itemviews/qidentityproxymodel.h
View File

@ -55,7 +55,7 @@ QT_MODULE(Gui)
class QIdentityProxyModelPrivate; class QIdentityProxyModelPrivate;
class Q_GUI_EXPORT QIdentityProxyModel : public QAbstractProxyModel class Q_WIDGETS_EXPORT QIdentityProxyModel : public QAbstractProxyModel
{ {
Q_OBJECT Q_OBJECT
public: public:

2
src/widgets/itemviews/qitemdelegate.h
View File

@ -58,7 +58,7 @@ QT_MODULE(Gui)
class QItemDelegatePrivate; class QItemDelegatePrivate;
class QItemEditorFactory; class QItemEditorFactory;
class Q_GUI_EXPORT QItemDelegate : public QAbstractItemDelegate class Q_WIDGETS_EXPORT QItemDelegate : public QAbstractItemDelegate
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool clipping READ hasClipping WRITE setClipping) Q_PROPERTY(bool clipping READ hasClipping WRITE setClipping)

4
src/widgets/itemviews/qitemeditorfactory.h
View File

@ -57,7 +57,7 @@ QT_MODULE(Gui)
class QWidget; class QWidget;
class Q_GUI_EXPORT QItemEditorCreatorBase class Q_WIDGETS_EXPORT QItemEditorCreatorBase
{ {
public: public:
virtual ~QItemEditorCreatorBase() {} virtual ~QItemEditorCreatorBase() {}
@ -97,7 +97,7 @@ template <class T>
Q_INLINE_TEMPLATE QItemEditorCreator<T>::QItemEditorCreator(const QByteArray &avaluePropertyName) Q_INLINE_TEMPLATE QItemEditorCreator<T>::QItemEditorCreator(const QByteArray &avaluePropertyName)
: propertyName(avaluePropertyName) {} : propertyName(avaluePropertyName) {}
class Q_GUI_EXPORT QItemEditorFactory class Q_WIDGETS_EXPORT QItemEditorFactory
{ {
public: public:
inline QItemEditorFactory() {} inline QItemEditorFactory() {}

8
src/widgets/itemviews/qitemselectionmodel.h
View File

@ -55,7 +55,7 @@ QT_MODULE(Gui)
#ifndef QT_NO_ITEMVIEWS #ifndef QT_NO_ITEMVIEWS
class Q_GUI_EXPORT QItemSelectionRange class Q_WIDGETS_EXPORT QItemSelectionRange
{ {
public: public:
@ -148,7 +148,7 @@ inline QItemSelectionRange::QItemSelectionRange(const QModelIndex &atopLeft,
class QItemSelection; class QItemSelection;
class QItemSelectionModelPrivate; class QItemSelectionModelPrivate;
class Q_GUI_EXPORT QItemSelectionModel : public QObject class Q_WIDGETS_EXPORT QItemSelectionModel : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QItemSelectionModel) Q_DECLARE_PRIVATE(QItemSelectionModel)
@ -228,7 +228,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QItemSelectionModel::SelectionFlags)
// dummy implentation of qHash() necessary for instantiating QList<QItemSelectionRange>::toSet() with MSVC // dummy implentation of qHash() necessary for instantiating QList<QItemSelectionRange>::toSet() with MSVC
inline uint qHash(const QItemSelectionRange &) { return 0; } inline uint qHash(const QItemSelectionRange &) { return 0; }
class Q_GUI_EXPORT QItemSelection : public QList<QItemSelectionRange> class Q_WIDGETS_EXPORT QItemSelection : public QList<QItemSelectionRange>
{ {
public: public:
QItemSelection() {} QItemSelection() {}
@ -243,7 +243,7 @@ public:
}; };
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
Q_GUI_EXPORT QDebug operator<<(QDebug, const QItemSelectionRange &); Q_WIDGETS_EXPORT QDebug operator<<(QDebug, const QItemSelectionRange &);
#endif #endif
#endif // QT_NO_ITEMVIEWS #endif // QT_NO_ITEMVIEWS

2
src/widgets/itemviews/qlistview.h
View File

@ -54,7 +54,7 @@ QT_MODULE(Gui)
class QListViewPrivate; class QListViewPrivate;
class Q_GUI_EXPORT QListView : public QAbstractItemView class Q_WIDGETS_EXPORT QListView : public QAbstractItemView
{ {
Q_OBJECT Q_OBJECT
Q_ENUMS(Movement Flow ResizeMode LayoutMode ViewMode) Q_ENUMS(Movement Flow ResizeMode LayoutMode ViewMode)

8
src/widgets/itemviews/qlistwidget.h
View File

@ -60,7 +60,7 @@ class QListModel;
class QWidgetItemData; class QWidgetItemData;
class QListWidgetItemPrivate; class QListWidgetItemPrivate;
class Q_GUI_EXPORT QListWidgetItem class Q_WIDGETS_EXPORT QListWidgetItem
{ {
friend class QListModel; friend class QListModel;
friend class QListWidget; friend class QListWidget;
@ -193,13 +193,13 @@ inline void QListWidgetItem::setFont(const QFont &afont)
{ setData(Qt::FontRole, afont); } { setData(Qt::FontRole, afont); }
#ifndef QT_NO_DATASTREAM #ifndef QT_NO_DATASTREAM
Q_GUI_EXPORT QDataStream &operator<<(QDataStream &out, const QListWidgetItem &item); Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &out, const QListWidgetItem &item);
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QListWidgetItem &item); Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &in, QListWidgetItem &item);
#endif #endif
class QListWidgetPrivate; class QListWidgetPrivate;
class Q_GUI_EXPORT QListWidget : public QListView class Q_WIDGETS_EXPORT QListWidget : public QListView
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(int count READ count) Q_PROPERTY(int count READ count)

2
src/widgets/itemviews/qproxymodel.h
View File

@ -54,7 +54,7 @@ QT_MODULE(Gui)
class QProxyModelPrivate; class QProxyModelPrivate;
class Q_GUI_EXPORT QProxyModel : public QAbstractItemModel class Q_WIDGETS_EXPORT QProxyModel : public QAbstractItemModel
{ {
Q_OBJECT Q_OBJECT

2
src/widgets/itemviews/qsortfilterproxymodel.h
View File

@ -58,7 +58,7 @@ class QSortFilterProxyModelPrivate;
class QSortFilterProxyModelLessThan; class QSortFilterProxyModelLessThan;
class QSortFilterProxyModelGreaterThan; class QSortFilterProxyModelGreaterThan;
class Q_GUI_EXPORT QSortFilterProxyModel : public QAbstractProxyModel class Q_WIDGETS_EXPORT QSortFilterProxyModel : public QAbstractProxyModel
{ {
friend class QSortFilterProxyModelLessThan; friend class QSortFilterProxyModelLessThan;
friend class QSortFilterProxyModelGreaterThan; friend class QSortFilterProxyModelGreaterThan;

8
src/widgets/itemviews/qstandarditemmodel.h
View File

@ -63,7 +63,7 @@ template <class T> class QList;
class QStandardItemModel; class QStandardItemModel;
class QStandardItemPrivate; class QStandardItemPrivate;
class Q_GUI_EXPORT QStandardItem class Q_WIDGETS_EXPORT QStandardItem
{ {
public: public:
QStandardItem(); QStandardItem();
@ -315,7 +315,7 @@ inline void QStandardItem::appendRow(QStandardItem *aitem)
class QStandardItemModelPrivate; class QStandardItemModelPrivate;
class Q_GUI_EXPORT QStandardItemModel : public QAbstractItemModel class Q_WIDGETS_EXPORT QStandardItemModel : public QAbstractItemModel
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(int sortRole READ sortRole WRITE setSortRole) Q_PROPERTY(int sortRole READ sortRole WRITE setSortRole)
@ -443,8 +443,8 @@ inline bool QStandardItemModel::insertColumn(int acolumn, const QModelIndex &apa
{ return QAbstractItemModel::insertColumn(acolumn, aparent); } { return QAbstractItemModel::insertColumn(acolumn, aparent); }
#ifndef QT_NO_DATASTREAM #ifndef QT_NO_DATASTREAM
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QStandardItem &item); Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &in, QStandardItem &item);
Q_GUI_EXPORT QDataStream &operator<<(QDataStream &out, const QStandardItem &item); Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &out, const QStandardItem &item);
#endif #endif
#endif // QT_NO_STANDARDITEMMODEL #endif // QT_NO_STANDARDITEMMODEL

2
src/widgets/itemviews/qstringlistmodel.h
View File

@ -53,7 +53,7 @@ QT_MODULE(Gui)
#ifndef QT_NO_STRINGLISTMODEL #ifndef QT_NO_STRINGLISTMODEL
class Q_GUI_EXPORT QStringListModel : public QAbstractListModel class Q_WIDGETS_EXPORT QStringListModel : public QAbstractListModel
{ {
Q_OBJECT Q_OBJECT
public: public:

2
src/widgets/itemviews/qstyleditemdelegate.h
View File

@ -58,7 +58,7 @@ QT_MODULE(Gui)
class QStyledItemDelegatePrivate; class QStyledItemDelegatePrivate;
class QItemEditorFactory; class QItemEditorFactory;
class Q_GUI_EXPORT QStyledItemDelegate : public QAbstractItemDelegate class Q_WIDGETS_EXPORT QStyledItemDelegate : public QAbstractItemDelegate
{ {
Q_OBJECT Q_OBJECT

2
src/widgets/itemviews/qtableview.h
View File

@ -55,7 +55,7 @@ QT_MODULE(Gui)
class QHeaderView; class QHeaderView;
class QTableViewPrivate; class QTableViewPrivate;
class Q_GUI_EXPORT QTableView : public QAbstractItemView class Q_WIDGETS_EXPORT QTableView : public QAbstractItemView
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool showGrid READ showGrid WRITE setShowGrid) Q_PROPERTY(bool showGrid READ showGrid WRITE setShowGrid)

10
src/widgets/itemviews/qtablewidget.h
View File

@ -55,7 +55,7 @@ QT_MODULE(Gui)
#ifndef QT_NO_TABLEWIDGET #ifndef QT_NO_TABLEWIDGET
class Q_GUI_EXPORT QTableWidgetSelectionRange class Q_WIDGETS_EXPORT QTableWidgetSelectionRange
{ {
public: public:
QTableWidgetSelectionRange(); QTableWidgetSelectionRange();
@ -79,7 +79,7 @@ class QTableModel;
class QWidgetItemData; class QWidgetItemData;
class QTableWidgetItemPrivate; class QTableWidgetItemPrivate;
class Q_GUI_EXPORT QTableWidgetItem class Q_WIDGETS_EXPORT QTableWidgetItem
{ {
friend class QTableWidget; friend class QTableWidget;
friend class QTableModel; friend class QTableModel;
@ -211,13 +211,13 @@ inline void QTableWidgetItem::setFont(const QFont &afont)
{ setData(Qt::FontRole, afont); } { setData(Qt::FontRole, afont); }
#ifndef QT_NO_DATASTREAM #ifndef QT_NO_DATASTREAM
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QTableWidgetItem &item); Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &in, QTableWidgetItem &item);
Q_GUI_EXPORT QDataStream &operator<<(QDataStream &out, const QTableWidgetItem &item); Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &out, const QTableWidgetItem &item);
#endif #endif
class QTableWidgetPrivate; class QTableWidgetPrivate;
class Q_GUI_EXPORT QTableWidget : public QTableView class Q_WIDGETS_EXPORT QTableWidget : public QTableView
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount) Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount)

2
src/widgets/itemviews/qtreeview.h
View File

@ -55,7 +55,7 @@ QT_MODULE(Gui)
class QTreeViewPrivate; class QTreeViewPrivate;
class QHeaderView; class QHeaderView;
class Q_GUI_EXPORT QTreeView : public QAbstractItemView class Q_WIDGETS_EXPORT QTreeView : public QAbstractItemView
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(int autoExpandDelay READ autoExpandDelay WRITE setAutoExpandDelay) Q_PROPERTY(int autoExpandDelay READ autoExpandDelay WRITE setAutoExpandDelay)

8
src/widgets/itemviews/qtreewidget.h
View File

@ -60,7 +60,7 @@ class QTreeModel;
class QWidgetItemData; class QWidgetItemData;
class QTreeWidgetItemPrivate; class QTreeWidgetItemPrivate;
class Q_GUI_EXPORT QTreeWidgetItem class Q_WIDGETS_EXPORT QTreeWidgetItem
{ {
friend class QTreeModel; friend class QTreeModel;
friend class QTreeWidget; friend class QTreeWidget;
@ -251,13 +251,13 @@ inline int QTreeWidgetItem::indexOfChild(QTreeWidgetItem *achild) const
{ executePendingSort(); return children.indexOf(achild); } { executePendingSort(); return children.indexOf(achild); }
#ifndef QT_NO_DATASTREAM #ifndef QT_NO_DATASTREAM
Q_GUI_EXPORT QDataStream &operator<<(QDataStream &out, const QTreeWidgetItem &item); Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &out, const QTreeWidgetItem &item);
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QTreeWidgetItem &item); Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &in, QTreeWidgetItem &item);
#endif #endif
class QTreeWidgetPrivate; class QTreeWidgetPrivate;
class Q_GUI_EXPORT QTreeWidget : public QTreeView class Q_WIDGETS_EXPORT QTreeWidget : public QTreeView
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount) Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount)

2
src/widgets/itemviews/qtreewidgetitemiterator.h
View File

@ -58,7 +58,7 @@ class QTreeWidgetItem;
class QTreeModel; class QTreeModel;
class QTreeWidgetItemIteratorPrivate; class QTreeWidgetItemIteratorPrivate;
class Q_GUI_EXPORT QTreeWidgetItemIterator class Q_WIDGETS_EXPORT QTreeWidgetItemIterator
{ {
friend class QTreeModel; friend class QTreeModel;

2
src/widgets/kernel/qaction.h
View File

@ -61,7 +61,7 @@ class QActionGroup;
class QActionPrivate; class QActionPrivate;
class QGraphicsWidget; class QGraphicsWidget;
class Q_GUI_EXPORT QAction : public QObject class Q_WIDGETS_EXPORT QAction : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QAction) Q_DECLARE_PRIVATE(QAction)

2
src/widgets/kernel/qactiongroup.h
View File

@ -54,7 +54,7 @@ QT_MODULE(Gui)
class QActionGroupPrivate; class QActionGroupPrivate;
class Q_GUI_EXPORT QActionGroup : public QObject class Q_WIDGETS_EXPORT QActionGroup : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QActionGroup) Q_DECLARE_PRIVATE(QActionGroup)

8
src/widgets/kernel/qapplication.cpp
View File

@ -465,8 +465,8 @@ int QApplicationPrivate::keyboard_input_time = 400; // keyboard input interval
#ifndef QT_NO_WHEELEVENT #ifndef QT_NO_WHEELEVENT
int QApplicationPrivate::wheel_scroll_lines; // number of lines to scroll int QApplicationPrivate::wheel_scroll_lines; // number of lines to scroll
#endif #endif
extern bool qt_is_gui_used; bool qt_is_gui_used;
bool Q_GUI_EXPORT qt_tab_all_widgets = true; bool Q_WIDGETS_EXPORT qt_tab_all_widgets = true;
bool qt_in_tab_key_event = false; bool qt_in_tab_key_event = false;
int qt_antialiasing_threshold = -1; int qt_antialiasing_threshold = -1;
static int drag_time = 500; static int drag_time = 500;
@ -2774,7 +2774,7 @@ void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave) {
} }
/* exported for the benefit of testing tools */ /* exported for the benefit of testing tools */
Q_GUI_EXPORT bool qt_tryModalHelper(QWidget *widget, QWidget **rettop) Q_WIDGETS_EXPORT bool qt_tryModalHelper(QWidget *widget, QWidget **rettop)
{ {
return QApplicationPrivate::tryModalHelper(widget, rettop); return QApplicationPrivate::tryModalHelper(widget, rettop);
} }
@ -5643,7 +5643,7 @@ void QApplicationPrivate::translateRawTouchEvent(QWidget *window,
} }
} }
Q_GUI_EXPORT void qt_translateRawTouchEvent(QWidget *window, Q_WIDGETS_EXPORT void qt_translateRawTouchEvent(QWidget *window,
QTouchEvent::DeviceType deviceType, QTouchEvent::DeviceType deviceType,
const QList<QTouchEvent::TouchPoint> &touchPoints) const QList<QTouchEvent::TouchPoint> &touchPoints)
{ {

2
src/widgets/kernel/qapplication.h
View File

@ -102,7 +102,7 @@ class QApplicationPrivate;
#define QApplicationBase QCoreApplication #define QApplicationBase QCoreApplication
#endif #endif
class Q_GUI_EXPORT QApplication : public QApplicationBase class Q_WIDGETS_EXPORT QApplication : public QApplicationBase
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QIcon windowIcon READ windowIcon WRITE setWindowIcon) Q_PROPERTY(QIcon windowIcon READ windowIcon WRITE setWindowIcon)

4
src/widgets/kernel/qapplication_p.h
View File

@ -296,7 +296,7 @@ PaletteHash *qt_app_palettes_hash();
#define QApplicationPrivateBase QCoreApplicationPrivate #define QApplicationPrivateBase QCoreApplicationPrivate
#endif #endif
class Q_GUI_EXPORT QApplicationPrivate : public QApplicationPrivateBase class Q_WIDGETS_EXPORT QApplicationPrivate : public QApplicationPrivateBase
{ {
Q_DECLARE_PUBLIC(QApplication) Q_DECLARE_PUBLIC(QApplication)
public: public:
@ -607,7 +607,7 @@ private:
static bool isAlien(QWidget *); static bool isAlien(QWidget *);
}; };
Q_GUI_EXPORT void qt_translateRawTouchEvent(QWidget *window, Q_WIDGETS_EXPORT void qt_translateRawTouchEvent(QWidget *window,
QTouchEvent::DeviceType deviceType, QTouchEvent::DeviceType deviceType,
const QList<QTouchEvent::TouchPoint> &touchPoints); const QList<QTouchEvent::TouchPoint> &touchPoints);

6
src/widgets/kernel/qboxlayout.h
View File

@ -57,7 +57,7 @@ QT_MODULE(Gui)
class QBoxLayoutPrivate; class QBoxLayoutPrivate;
class Q_GUI_EXPORT QBoxLayout : public QLayout class Q_WIDGETS_EXPORT QBoxLayout : public QLayout
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QBoxLayout) Q_DECLARE_PRIVATE(QBoxLayout)
@ -126,7 +126,7 @@ private:
Q_DISABLE_COPY(QBoxLayout) Q_DISABLE_COPY(QBoxLayout)
}; };
class Q_GUI_EXPORT QHBoxLayout : public QBoxLayout class Q_WIDGETS_EXPORT QHBoxLayout : public QBoxLayout
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -146,7 +146,7 @@ private:
Q_DISABLE_COPY(QHBoxLayout) Q_DISABLE_COPY(QHBoxLayout)
}; };
class Q_GUI_EXPORT QVBoxLayout : public QBoxLayout class Q_WIDGETS_EXPORT QVBoxLayout : public QBoxLayout
{ {
Q_OBJECT Q_OBJECT
public: public:

2
src/widgets/kernel/qdesktopwidget.h
View File

@ -53,7 +53,7 @@ QT_MODULE(Gui)
class QApplication; class QApplication;
class QDesktopWidgetPrivate; class QDesktopWidgetPrivate;
class Q_GUI_EXPORT QDesktopWidget : public QWidget class Q_WIDGETS_EXPORT QDesktopWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool virtualDesktop READ isVirtualDesktop) Q_PROPERTY(bool virtualDesktop READ isVirtualDesktop)

2
src/widgets/kernel/qformlayout.h
View File

@ -52,7 +52,7 @@ QT_MODULE(Gui)
class QFormLayoutPrivate; class QFormLayoutPrivate;
class Q_GUI_EXPORT QFormLayout : public QLayout class Q_WIDGETS_EXPORT QFormLayout : public QLayout
{ {
Q_OBJECT Q_OBJECT
Q_ENUMS(FormStyle FieldGrowthPolicy RowWrapPolicy ItemRole) Q_ENUMS(FormStyle FieldGrowthPolicy RowWrapPolicy ItemRole)

14
src/widgets/kernel/qgesture.h
View File

@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Gui) QT_MODULE(Gui)
class QGesturePrivate; class QGesturePrivate;
class Q_GUI_EXPORT QGesture : public QObject class Q_WIDGETS_EXPORT QGesture : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QGesture) Q_DECLARE_PRIVATE(QGesture)
@ -105,7 +105,7 @@ private:
}; };
class QPanGesturePrivate; class QPanGesturePrivate;
class Q_GUI_EXPORT QPanGesture : public QGesture class Q_WIDGETS_EXPORT QPanGesture : public QGesture
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QPanGesture) Q_DECLARE_PRIVATE(QPanGesture)
@ -134,7 +134,7 @@ public:
}; };
class QPinchGesturePrivate; class QPinchGesturePrivate;
class Q_GUI_EXPORT QPinchGesture : public QGesture class Q_WIDGETS_EXPORT QPinchGesture : public QGesture
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QPinchGesture) Q_DECLARE_PRIVATE(QPinchGesture)
@ -205,7 +205,7 @@ Q_DECLARE_METATYPE(QPinchGesture::ChangeFlags)
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QSwipeGesturePrivate; class QSwipeGesturePrivate;
class Q_GUI_EXPORT QSwipeGesture : public QGesture class Q_WIDGETS_EXPORT QSwipeGesture : public QGesture
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QSwipeGesture) Q_DECLARE_PRIVATE(QSwipeGesture)
@ -230,7 +230,7 @@ public:
}; };
class QTapGesturePrivate; class QTapGesturePrivate;
class Q_GUI_EXPORT QTapGesture : public QGesture class Q_WIDGETS_EXPORT QTapGesture : public QGesture
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QTapGesture) Q_DECLARE_PRIVATE(QTapGesture)
@ -247,7 +247,7 @@ public:
}; };
class QTapAndHoldGesturePrivate; class QTapAndHoldGesturePrivate;
class Q_GUI_EXPORT QTapAndHoldGesture : public QGesture class Q_WIDGETS_EXPORT QTapAndHoldGesture : public QGesture
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QTapAndHoldGesture) Q_DECLARE_PRIVATE(QTapAndHoldGesture)
@ -268,7 +268,7 @@ public:
class QGesture; class QGesture;
class QGestureEventPrivate; class QGestureEventPrivate;
class Q_GUI_EXPORT QGestureEvent : public QEvent class Q_WIDGETS_EXPORT QGestureEvent : public QEvent
{ {
public: public:
QGestureEvent(const QList<QGesture *> &gestures); QGestureEvent(const QList<QGesture *> &gestures);

2
src/widgets/kernel/qgesturerecognizer.h
View File

@ -56,7 +56,7 @@ QT_MODULE(Gui)
class QObject; class QObject;
class QEvent; class QEvent;
class QGesture; class QGesture;
class Q_GUI_EXPORT QGestureRecognizer class Q_WIDGETS_EXPORT QGestureRecognizer
{ {
public: public:
enum ResultFlag enum ResultFlag

2
src/widgets/kernel/qgridlayout.h
View File

@ -57,7 +57,7 @@ QT_MODULE(Gui)
class QGridLayoutPrivate; class QGridLayoutPrivate;
class Q_GUI_EXPORT QGridLayout : public QLayout class Q_WIDGETS_EXPORT QGridLayout : public QLayout
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QGridLayout) Q_DECLARE_PRIVATE(QGridLayout)

4
src/widgets/kernel/qguiplatformplugin_p.h
View File

@ -70,7 +70,7 @@ class QFileDialog;
class QColorDialog; class QColorDialog;
class QFileInfo; class QFileInfo;
struct Q_GUI_EXPORT QGuiPlatformPluginInterface : public QFactoryInterface struct Q_WIDGETS_EXPORT QGuiPlatformPluginInterface : public QFactoryInterface
{ {
}; };
@ -78,7 +78,7 @@ struct Q_GUI_EXPORT QGuiPlatformPluginInterface : public QFactoryInterface
Q_DECLARE_INTERFACE(QGuiPlatformPluginInterface, QGuiPlatformPluginInterface_iid) Q_DECLARE_INTERFACE(QGuiPlatformPluginInterface, QGuiPlatformPluginInterface_iid)
class Q_GUI_EXPORT QGuiPlatformPlugin : public QObject, public QGuiPlatformPluginInterface class Q_WIDGETS_EXPORT QGuiPlatformPlugin : public QObject, public QGuiPlatformPluginInterface
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(QGuiPlatformPluginInterface:QFactoryInterface) Q_INTERFACES(QGuiPlatformPluginInterface:QFactoryInterface)

10
src/widgets/kernel/qicon.h
View File

@ -57,7 +57,7 @@ class QIconPrivate;
class QIconEngine; class QIconEngine;
class QIconEngineV2; class QIconEngineV2;
class Q_GUI_EXPORT QIcon class Q_WIDGETS_EXPORT QIcon
{ {
public: public:
enum Mode { Normal, Disabled, Active, Selected }; enum Mode { Normal, Disabled, Active, Selected };
@ -119,8 +119,8 @@ public:
private: private:
QIconPrivate *d; QIconPrivate *d;
#if !defined(QT_NO_DATASTREAM) #if !defined(QT_NO_DATASTREAM)
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &); friend Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &);
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QIcon &); friend Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QIcon &);
#endif #endif
public: public:
@ -132,8 +132,8 @@ Q_DECLARE_SHARED(QIcon)
Q_DECLARE_TYPEINFO(QIcon, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(QIcon, Q_MOVABLE_TYPE);
#if !defined(QT_NO_DATASTREAM) #if !defined(QT_NO_DATASTREAM)
Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &); Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &);
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QIcon &); Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QIcon &);
#endif #endif
QT_END_NAMESPACE QT_END_NAMESPACE

4
src/widgets/kernel/qiconengine.h
View File

@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Gui) QT_MODULE(Gui)
class Q_GUI_EXPORT QIconEngine class Q_WIDGETS_EXPORT QIconEngine
{ {
public: public:
virtual ~QIconEngine(); virtual ~QIconEngine();
@ -70,7 +70,7 @@ public:
}; };
// ### Qt 5: move the below into QIconEngine // ### Qt 5: move the below into QIconEngine
class Q_GUI_EXPORT QIconEngineV2 : public QIconEngine class Q_WIDGETS_EXPORT QIconEngineV2 : public QIconEngine
{ {
public: public:
virtual QString key() const; virtual QString key() const;

8
src/widgets/kernel/qiconengineplugin.h
View File

@ -54,7 +54,7 @@ QT_MODULE(Gui)
class QIconEngine; class QIconEngine;
class QIconEngineV2; class QIconEngineV2;
struct Q_GUI_EXPORT QIconEngineFactoryInterface : public QFactoryInterface struct Q_WIDGETS_EXPORT QIconEngineFactoryInterface : public QFactoryInterface
{ {
virtual QIconEngine *create(const QString &filename) = 0; virtual QIconEngine *create(const QString &filename) = 0;
}; };
@ -63,7 +63,7 @@ struct Q_GUI_EXPORT QIconEngineFactoryInterface : public QFactoryInterface
"com.trolltech.Qt.QIconEngineFactoryInterface" "com.trolltech.Qt.QIconEngineFactoryInterface"
Q_DECLARE_INTERFACE(QIconEngineFactoryInterface, QIconEngineFactoryInterface_iid) Q_DECLARE_INTERFACE(QIconEngineFactoryInterface, QIconEngineFactoryInterface_iid)
class Q_GUI_EXPORT QIconEnginePlugin : public QObject, public QIconEngineFactoryInterface class Q_WIDGETS_EXPORT QIconEnginePlugin : public QObject, public QIconEngineFactoryInterface
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(QIconEngineFactoryInterface:QFactoryInterface) Q_INTERFACES(QIconEngineFactoryInterface:QFactoryInterface)
@ -76,7 +76,7 @@ public:
}; };
// ### Qt 5: remove version 2 // ### Qt 5: remove version 2
struct Q_GUI_EXPORT QIconEngineFactoryInterfaceV2 : public QFactoryInterface struct Q_WIDGETS_EXPORT QIconEngineFactoryInterfaceV2 : public QFactoryInterface
{ {
virtual QIconEngineV2 *create(const QString &filename = QString()) = 0; virtual QIconEngineV2 *create(const QString &filename = QString()) = 0;
}; };
@ -85,7 +85,7 @@ struct Q_GUI_EXPORT QIconEngineFactoryInterfaceV2 : public QFactoryInterface
"com.trolltech.Qt.QIconEngineFactoryInterfaceV2" "com.trolltech.Qt.QIconEngineFactoryInterfaceV2"
Q_DECLARE_INTERFACE(QIconEngineFactoryInterfaceV2, QIconEngineFactoryInterfaceV2_iid) Q_DECLARE_INTERFACE(QIconEngineFactoryInterfaceV2, QIconEngineFactoryInterfaceV2_iid)
class Q_GUI_EXPORT QIconEnginePluginV2 : public QObject, public QIconEngineFactoryInterfaceV2 class Q_WIDGETS_EXPORT QIconEnginePluginV2 : public QObject, public QIconEngineFactoryInterfaceV2
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(QIconEngineFactoryInterfaceV2:QFactoryInterface) Q_INTERFACES(QIconEngineFactoryInterfaceV2:QFactoryInterface)

4
src/widgets/kernel/qlayout.h
View File

@ -60,7 +60,7 @@ class QLayout;
class QSize; class QSize;
#ifdef QT3_SUPPORT #ifdef QT3_SUPPORT
class Q_GUI_EXPORT QLayoutIterator class Q_WIDGETS_EXPORT QLayoutIterator
{ {
public: public:
inline QT3_SUPPORT_CONSTRUCTOR QLayoutIterator(QLayout *i) : layout(i), index(0) {} inline QT3_SUPPORT_CONSTRUCTOR QLayoutIterator(QLayout *i) : layout(i), index(0) {}
@ -87,7 +87,7 @@ private:
class QLayoutPrivate; class QLayoutPrivate;
class Q_GUI_EXPORT QLayout : public QObject, public QLayoutItem class Q_WIDGETS_EXPORT QLayout : public QObject, public QLayoutItem
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QLayout) Q_DECLARE_PRIVATE(QLayout)

2
src/widgets/kernel/qlayout_p.h
View File

@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
class QWidgetItem; class QWidgetItem;
class QSpacerItem; class QSpacerItem;
class Q_GUI_EXPORT QLayoutPrivate : public QObjectPrivate class Q_WIDGETS_EXPORT QLayoutPrivate : public QObjectPrivate
{ {
Q_DECLARE_PUBLIC(QLayout) Q_DECLARE_PUBLIC(QLayout)

14
src/widgets/kernel/qlayoutengine.cpp
View File

@ -338,7 +338,7 @@ void qGeomCalc(QVector<QLayoutStruct> &chain, int start, int count,
#endif #endif
} }
Q_GUI_EXPORT QSize qSmartMinSize(const QSize &sizeHint, const QSize &minSizeHint, Q_WIDGETS_EXPORT QSize qSmartMinSize(const QSize &sizeHint, const QSize &minSizeHint,
const QSize &minSize, const QSize &maxSize, const QSize &minSize, const QSize &maxSize,
const QSizePolicy &sizePolicy) const QSizePolicy &sizePolicy)
{ {
@ -368,7 +368,7 @@ Q_GUI_EXPORT QSize qSmartMinSize(const QSize &sizeHint, const QSize &minSizeHint
return s.expandedTo(QSize(0,0)); return s.expandedTo(QSize(0,0));
} }
Q_GUI_EXPORT QSize qSmartMinSize(const QWidgetItem *i) Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidgetItem *i)
{ {
QWidget *w = ((QWidgetItem *)i)->widget(); QWidget *w = ((QWidgetItem *)i)->widget();
return qSmartMinSize(w->sizeHint(), w->minimumSizeHint(), return qSmartMinSize(w->sizeHint(), w->minimumSizeHint(),
@ -376,14 +376,14 @@ Q_GUI_EXPORT QSize qSmartMinSize(const QWidgetItem *i)
w->sizePolicy()); w->sizePolicy());
} }
Q_GUI_EXPORT QSize qSmartMinSize(const QWidget *w) Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidget *w)
{ {
return qSmartMinSize(w->sizeHint(), w->minimumSizeHint(), return qSmartMinSize(w->sizeHint(), w->minimumSizeHint(),
w->minimumSize(), w->maximumSize(), w->minimumSize(), w->maximumSize(),
w->sizePolicy()); w->sizePolicy());
} }
Q_GUI_EXPORT QSize qSmartMaxSize(const QSize &sizeHint, Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QSize &sizeHint,
const QSize &minSize, const QSize &maxSize, const QSize &minSize, const QSize &maxSize,
const QSizePolicy &sizePolicy, Qt::Alignment align) const QSizePolicy &sizePolicy, Qt::Alignment align)
{ {
@ -406,7 +406,7 @@ Q_GUI_EXPORT QSize qSmartMaxSize(const QSize &sizeHint,
return s; return s;
} }
Q_GUI_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align) Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align)
{ {
QWidget *w = ((QWidgetItem*)i)->widget(); QWidget *w = ((QWidgetItem*)i)->widget();
@ -414,13 +414,13 @@ Q_GUI_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align)
w->sizePolicy(), align); w->sizePolicy(), align);
} }
Q_GUI_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align) Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align)
{ {
return qSmartMaxSize(w->sizeHint().expandedTo(w->minimumSizeHint()), w->minimumSize(), w->maximumSize(), return qSmartMaxSize(w->sizeHint().expandedTo(w->minimumSizeHint()), w->minimumSize(), w->maximumSize(),
w->sizePolicy(), align); w->sizePolicy(), align);
} }
Q_GUI_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm) Q_WIDGETS_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm)
{ {
QObject *parent = layout->parent(); QObject *parent = layout->parent();
if (!parent) { if (!parent) {

16
src/widgets/kernel/qlayoutengine_p.h
View File

@ -97,20 +97,20 @@ struct QLayoutStruct
}; };
Q_GUI_EXPORT void qGeomCalc(QVector<QLayoutStruct> &chain, int start, int count, Q_WIDGETS_EXPORT void qGeomCalc(QVector<QLayoutStruct> &chain, int start, int count,
int pos, int space, int spacer = -1); int pos, int space, int spacer = -1);
Q_GUI_EXPORT QSize qSmartMinSize(const QSize &sizeHint, const QSize &minSizeHint, Q_WIDGETS_EXPORT QSize qSmartMinSize(const QSize &sizeHint, const QSize &minSizeHint,
const QSize &minSize, const QSize &maxSize, const QSize &minSize, const QSize &maxSize,
const QSizePolicy &sizePolicy); const QSizePolicy &sizePolicy);
Q_GUI_EXPORT QSize qSmartMinSize(const QWidgetItem *i); Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidgetItem *i);
Q_GUI_EXPORT QSize qSmartMinSize(const QWidget *w); Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidget *w);
Q_GUI_EXPORT QSize qSmartMaxSize(const QSize &sizeHint, Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QSize &sizeHint,
const QSize &minSize, const QSize &maxSize, const QSize &minSize, const QSize &maxSize,
const QSizePolicy &sizePolicy, Qt::Alignment align = 0); const QSizePolicy &sizePolicy, Qt::Alignment align = 0);
Q_GUI_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align = 0); Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align = 0);
Q_GUI_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = 0); Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = 0);
Q_GUI_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm); Q_WIDGETS_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm);
/* /*
Modify total maximum (max), total expansion (exp), and total empty Modify total maximum (max), total expansion (exp), and total empty

8
src/widgets/kernel/qlayoutitem.h
View File

@ -61,7 +61,7 @@ class QSpacerItem;
class QWidget; class QWidget;
class QSize; class QSize;
class Q_GUI_EXPORT QLayoutItem class Q_WIDGETS_EXPORT QLayoutItem
{ {
public: public:
inline explicit QLayoutItem(Qt::Alignment alignment = 0); inline explicit QLayoutItem(Qt::Alignment alignment = 0);
@ -93,7 +93,7 @@ protected:
inline QLayoutItem::QLayoutItem(Qt::Alignment aalignment) inline QLayoutItem::QLayoutItem(Qt::Alignment aalignment)
: align(aalignment) { } : align(aalignment) { }
class Q_GUI_EXPORT QSpacerItem : public QLayoutItem class Q_WIDGETS_EXPORT QSpacerItem : public QLayoutItem
{ {
public: public:
QSpacerItem(int w, int h, QSpacerItem(int w, int h,
@ -119,7 +119,7 @@ private:
QRect rect; QRect rect;
}; };
class Q_GUI_EXPORT QWidgetItem : public QLayoutItem class Q_WIDGETS_EXPORT QWidgetItem : public QLayoutItem
{ {
Q_DISABLE_COPY(QWidgetItem) Q_DISABLE_COPY(QWidgetItem)
@ -141,7 +141,7 @@ protected:
QWidget *wid; QWidget *wid;
}; };
class Q_GUI_EXPORT QWidgetItemV2 : public QWidgetItem class Q_WIDGETS_EXPORT QWidgetItemV2 : public QWidgetItem
{ {
public: public:
explicit QWidgetItemV2(QWidget *widget); explicit QWidgetItemV2(QWidget *widget);

10
src/widgets/kernel/qsizepolicy.h
View File

@ -52,7 +52,7 @@ QT_MODULE(Gui)
class QVariant; class QVariant;
class Q_GUI_EXPORT QSizePolicy class Q_WIDGETS_EXPORT QSizePolicy
{ {
Q_GADGET Q_GADGET
Q_ENUMS(Policy) Q_ENUMS(Policy)
@ -196,8 +196,8 @@ public:
private: private:
#ifndef QT_NO_DATASTREAM #ifndef QT_NO_DATASTREAM
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &); friend Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &);
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &); friend Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &);
#endif #endif
QSizePolicy(int i) : data(i) { } QSizePolicy(int i) : data(i) { }
@ -222,8 +222,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSizePolicy::ControlTypes)
#ifndef QT_NO_DATASTREAM #ifndef QT_NO_DATASTREAM
// implemented in qlayout.cpp // implemented in qlayout.cpp
Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &); Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &);
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &); Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &);
#endif #endif
inline void QSizePolicy::transpose() { inline void QSizePolicy::transpose() {

2
src/widgets/kernel/qsound.h
View File

@ -54,7 +54,7 @@ QT_MODULE(Gui)
class QSoundPrivate; class QSoundPrivate;
class Q_GUI_EXPORT QSound : public QObject class Q_WIDGETS_EXPORT QSound : public QObject
{ {
Q_OBJECT Q_OBJECT

2
src/widgets/kernel/qstackedlayout.h
View File

@ -52,7 +52,7 @@ QT_MODULE(Gui)
class QStackedLayoutPrivate; class QStackedLayoutPrivate;
class Q_GUI_EXPORT QStackedLayout : public QLayout class Q_WIDGETS_EXPORT QStackedLayout : public QLayout
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QStackedLayout) Q_DECLARE_PRIVATE(QStackedLayout)

2
src/widgets/kernel/qtooltip.h
View File

@ -52,7 +52,7 @@ QT_MODULE(Gui)
#ifndef QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP
class Q_GUI_EXPORT QToolTip class Q_WIDGETS_EXPORT QToolTip
{ {
QToolTip(); QToolTip();
public: public:

2
src/widgets/kernel/qwhatsthis.h
View File

@ -58,7 +58,7 @@ class QAction;
class QToolButton; class QToolButton;
#endif #endif
class Q_GUI_EXPORT QWhatsThis class Q_WIDGETS_EXPORT QWhatsThis
{ {
QWhatsThis(); QWhatsThis();

Some files were not shown because too many files have changed in this diff Show More