diff options
Diffstat (limited to 'src/widgets/kernel')
30 files changed, 76 insertions, 76 deletions
diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index ee259e3242..db2b4bf0b3 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -61,7 +61,7 @@ class QActionGroup; class QActionPrivate; class QGraphicsWidget; -class Q_GUI_EXPORT QAction : public QObject +class Q_WIDGETS_EXPORT QAction : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QAction) diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h index d59b9b64e6..deeed061cd 100644 --- a/src/widgets/kernel/qactiongroup.h +++ b/src/widgets/kernel/qactiongroup.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QActionGroupPrivate; -class Q_GUI_EXPORT QActionGroup : public QObject +class Q_WIDGETS_EXPORT QActionGroup : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QActionGroup) diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 13a4eca745..ec7c3a5712 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -465,8 +465,8 @@ int QApplicationPrivate::keyboard_input_time = 400; // keyboard input interval #ifndef QT_NO_WHEELEVENT int QApplicationPrivate::wheel_scroll_lines; // number of lines to scroll #endif -extern bool qt_is_gui_used; -bool Q_GUI_EXPORT qt_tab_all_widgets = true; +bool qt_is_gui_used; +bool Q_WIDGETS_EXPORT qt_tab_all_widgets = true; bool qt_in_tab_key_event = false; int qt_antialiasing_threshold = -1; static int drag_time = 500; @@ -2774,7 +2774,7 @@ void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave) { } /* 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); } @@ -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, const QList<QTouchEvent::TouchPoint> &touchPoints) { diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 2aa4ce776d..4c62d0b9ea 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -102,7 +102,7 @@ class QApplicationPrivate; #define QApplicationBase QCoreApplication #endif -class Q_GUI_EXPORT QApplication : public QApplicationBase +class Q_WIDGETS_EXPORT QApplication : public QApplicationBase { Q_OBJECT Q_PROPERTY(QIcon windowIcon READ windowIcon WRITE setWindowIcon) diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 40308db870..75cc003a1d 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -296,7 +296,7 @@ PaletteHash *qt_app_palettes_hash(); #define QApplicationPrivateBase QCoreApplicationPrivate #endif -class Q_GUI_EXPORT QApplicationPrivate : public QApplicationPrivateBase +class Q_WIDGETS_EXPORT QApplicationPrivate : public QApplicationPrivateBase { Q_DECLARE_PUBLIC(QApplication) public: @@ -607,7 +607,7 @@ private: static bool isAlien(QWidget *); }; -Q_GUI_EXPORT void qt_translateRawTouchEvent(QWidget *window, +Q_WIDGETS_EXPORT void qt_translateRawTouchEvent(QWidget *window, QTouchEvent::DeviceType deviceType, const QList<QTouchEvent::TouchPoint> &touchPoints); diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index bd343729f5..7c56a32979 100644 --- a/src/widgets/kernel/qboxlayout.h +++ b/src/widgets/kernel/qboxlayout.h @@ -57,7 +57,7 @@ QT_MODULE(Gui) class QBoxLayoutPrivate; -class Q_GUI_EXPORT QBoxLayout : public QLayout +class Q_WIDGETS_EXPORT QBoxLayout : public QLayout { Q_OBJECT Q_DECLARE_PRIVATE(QBoxLayout) @@ -126,7 +126,7 @@ private: Q_DISABLE_COPY(QBoxLayout) }; -class Q_GUI_EXPORT QHBoxLayout : public QBoxLayout +class Q_WIDGETS_EXPORT QHBoxLayout : public QBoxLayout { Q_OBJECT public: @@ -146,7 +146,7 @@ private: Q_DISABLE_COPY(QHBoxLayout) }; -class Q_GUI_EXPORT QVBoxLayout : public QBoxLayout +class Q_WIDGETS_EXPORT QVBoxLayout : public QBoxLayout { Q_OBJECT public: diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index e1f99640b9..e1ed8cfa07 100644 --- a/src/widgets/kernel/qdesktopwidget.h +++ b/src/widgets/kernel/qdesktopwidget.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) class QApplication; class QDesktopWidgetPrivate; -class Q_GUI_EXPORT QDesktopWidget : public QWidget +class Q_WIDGETS_EXPORT QDesktopWidget : public QWidget { Q_OBJECT Q_PROPERTY(bool virtualDesktop READ isVirtualDesktop) diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h index aaada26def..05bb57d981 100644 --- a/src/widgets/kernel/qformlayout.h +++ b/src/widgets/kernel/qformlayout.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) class QFormLayoutPrivate; -class Q_GUI_EXPORT QFormLayout : public QLayout +class Q_WIDGETS_EXPORT QFormLayout : public QLayout { Q_OBJECT Q_ENUMS(FormStyle FieldGrowthPolicy RowWrapPolicy ItemRole) diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index 5197e0edb9..610ae2b9f6 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) class QGesturePrivate; -class Q_GUI_EXPORT QGesture : public QObject +class Q_WIDGETS_EXPORT QGesture : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QGesture) @@ -105,7 +105,7 @@ private: }; class QPanGesturePrivate; -class Q_GUI_EXPORT QPanGesture : public QGesture +class Q_WIDGETS_EXPORT QPanGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QPanGesture) @@ -134,7 +134,7 @@ public: }; class QPinchGesturePrivate; -class Q_GUI_EXPORT QPinchGesture : public QGesture +class Q_WIDGETS_EXPORT QPinchGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QPinchGesture) @@ -205,7 +205,7 @@ Q_DECLARE_METATYPE(QPinchGesture::ChangeFlags) QT_BEGIN_NAMESPACE class QSwipeGesturePrivate; -class Q_GUI_EXPORT QSwipeGesture : public QGesture +class Q_WIDGETS_EXPORT QSwipeGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QSwipeGesture) @@ -230,7 +230,7 @@ public: }; class QTapGesturePrivate; -class Q_GUI_EXPORT QTapGesture : public QGesture +class Q_WIDGETS_EXPORT QTapGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QTapGesture) @@ -247,7 +247,7 @@ public: }; class QTapAndHoldGesturePrivate; -class Q_GUI_EXPORT QTapAndHoldGesture : public QGesture +class Q_WIDGETS_EXPORT QTapAndHoldGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QTapAndHoldGesture) @@ -268,7 +268,7 @@ public: class QGesture; class QGestureEventPrivate; -class Q_GUI_EXPORT QGestureEvent : public QEvent +class Q_WIDGETS_EXPORT QGestureEvent : public QEvent { public: QGestureEvent(const QList<QGesture *> &gestures); diff --git a/src/widgets/kernel/qgesturerecognizer.h b/src/widgets/kernel/qgesturerecognizer.h index d3574f7ad2..019f856f09 100644 --- a/src/widgets/kernel/qgesturerecognizer.h +++ b/src/widgets/kernel/qgesturerecognizer.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QObject; class QEvent; class QGesture; -class Q_GUI_EXPORT QGestureRecognizer +class Q_WIDGETS_EXPORT QGestureRecognizer { public: enum ResultFlag diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index 6923218d2d..3e579e3dfd 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -57,7 +57,7 @@ QT_MODULE(Gui) class QGridLayoutPrivate; -class Q_GUI_EXPORT QGridLayout : public QLayout +class Q_WIDGETS_EXPORT QGridLayout : public QLayout { Q_OBJECT Q_DECLARE_PRIVATE(QGridLayout) diff --git a/src/widgets/kernel/qguiplatformplugin_p.h b/src/widgets/kernel/qguiplatformplugin_p.h index dff3c45c25..3fae6a5cbe 100644 --- a/src/widgets/kernel/qguiplatformplugin_p.h +++ b/src/widgets/kernel/qguiplatformplugin_p.h @@ -70,7 +70,7 @@ class QFileDialog; class QColorDialog; 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) -class Q_GUI_EXPORT QGuiPlatformPlugin : public QObject, public QGuiPlatformPluginInterface +class Q_WIDGETS_EXPORT QGuiPlatformPlugin : public QObject, public QGuiPlatformPluginInterface { Q_OBJECT Q_INTERFACES(QGuiPlatformPluginInterface:QFactoryInterface) diff --git a/src/widgets/kernel/qicon.h b/src/widgets/kernel/qicon.h index 2fc2863236..3c527eb974 100644 --- a/src/widgets/kernel/qicon.h +++ b/src/widgets/kernel/qicon.h @@ -57,7 +57,7 @@ class QIconPrivate; class QIconEngine; class QIconEngineV2; -class Q_GUI_EXPORT QIcon +class Q_WIDGETS_EXPORT QIcon { public: enum Mode { Normal, Disabled, Active, Selected }; @@ -119,8 +119,8 @@ public: private: QIconPrivate *d; #if !defined(QT_NO_DATASTREAM) - friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &); - friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QIcon &); + friend Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &); + friend Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QIcon &); #endif public: @@ -132,8 +132,8 @@ Q_DECLARE_SHARED(QIcon) Q_DECLARE_TYPEINFO(QIcon, Q_MOVABLE_TYPE); #if !defined(QT_NO_DATASTREAM) -Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &); -Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QIcon &); +Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &); +Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QIcon &); #endif QT_END_NAMESPACE diff --git a/src/widgets/kernel/qiconengine.h b/src/widgets/kernel/qiconengine.h index fada291c81..63cfcbff5e 100644 --- a/src/widgets/kernel/qiconengine.h +++ b/src/widgets/kernel/qiconengine.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -class Q_GUI_EXPORT QIconEngine +class Q_WIDGETS_EXPORT QIconEngine { public: virtual ~QIconEngine(); @@ -70,7 +70,7 @@ public: }; // ### Qt 5: move the below into QIconEngine -class Q_GUI_EXPORT QIconEngineV2 : public QIconEngine +class Q_WIDGETS_EXPORT QIconEngineV2 : public QIconEngine { public: virtual QString key() const; diff --git a/src/widgets/kernel/qiconengineplugin.h b/src/widgets/kernel/qiconengineplugin.h index 8e744b4e9c..c228e8666b 100644 --- a/src/widgets/kernel/qiconengineplugin.h +++ b/src/widgets/kernel/qiconengineplugin.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QIconEngine; class QIconEngineV2; -struct Q_GUI_EXPORT QIconEngineFactoryInterface : public QFactoryInterface +struct Q_WIDGETS_EXPORT QIconEngineFactoryInterface : public QFactoryInterface { virtual QIconEngine *create(const QString &filename) = 0; }; @@ -63,7 +63,7 @@ struct Q_GUI_EXPORT QIconEngineFactoryInterface : public QFactoryInterface "com.trolltech.Qt.QIconEngineFactoryInterface" 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_INTERFACES(QIconEngineFactoryInterface:QFactoryInterface) @@ -76,7 +76,7 @@ public: }; // ### 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; }; @@ -85,7 +85,7 @@ struct Q_GUI_EXPORT QIconEngineFactoryInterfaceV2 : public QFactoryInterface "com.trolltech.Qt.QIconEngineFactoryInterfaceV2" 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_INTERFACES(QIconEngineFactoryInterfaceV2:QFactoryInterface) diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index ad6df43908..d9f732bd14 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -60,7 +60,7 @@ class QLayout; class QSize; #ifdef QT3_SUPPORT -class Q_GUI_EXPORT QLayoutIterator +class Q_WIDGETS_EXPORT QLayoutIterator { public: inline QT3_SUPPORT_CONSTRUCTOR QLayoutIterator(QLayout *i) : layout(i), index(0) {} @@ -87,7 +87,7 @@ private: class QLayoutPrivate; -class Q_GUI_EXPORT QLayout : public QObject, public QLayoutItem +class Q_WIDGETS_EXPORT QLayout : public QObject, public QLayoutItem { Q_OBJECT Q_DECLARE_PRIVATE(QLayout) diff --git a/src/widgets/kernel/qlayout_p.h b/src/widgets/kernel/qlayout_p.h index 9e8d9cd355..e282360418 100644 --- a/src/widgets/kernel/qlayout_p.h +++ b/src/widgets/kernel/qlayout_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE class QWidgetItem; class QSpacerItem; -class Q_GUI_EXPORT QLayoutPrivate : public QObjectPrivate +class Q_WIDGETS_EXPORT QLayoutPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QLayout) diff --git a/src/widgets/kernel/qlayoutengine.cpp b/src/widgets/kernel/qlayoutengine.cpp index a93661737d..a7470aabaa 100644 --- a/src/widgets/kernel/qlayoutengine.cpp +++ b/src/widgets/kernel/qlayoutengine.cpp @@ -338,7 +338,7 @@ void qGeomCalc(QVector<QLayoutStruct> &chain, int start, int count, #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 QSizePolicy &sizePolicy) { @@ -368,7 +368,7 @@ Q_GUI_EXPORT QSize qSmartMinSize(const QSize &sizeHint, const QSize &minSizeHint 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(); return qSmartMinSize(w->sizeHint(), w->minimumSizeHint(), @@ -376,14 +376,14 @@ Q_GUI_EXPORT QSize qSmartMinSize(const QWidgetItem *i) w->sizePolicy()); } -Q_GUI_EXPORT QSize qSmartMinSize(const QWidget *w) +Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidget *w) { return qSmartMinSize(w->sizeHint(), w->minimumSizeHint(), w->minimumSize(), w->maximumSize(), 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 QSizePolicy &sizePolicy, Qt::Alignment align) { @@ -406,7 +406,7 @@ Q_GUI_EXPORT QSize qSmartMaxSize(const QSize &sizeHint, 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(); @@ -414,13 +414,13 @@ Q_GUI_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment 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(), 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(); if (!parent) { diff --git a/src/widgets/kernel/qlayoutengine_p.h b/src/widgets/kernel/qlayoutengine_p.h index d46395850b..9be9ecd321 100644 --- a/src/widgets/kernel/qlayoutengine_p.h +++ b/src/widgets/kernel/qlayoutengine_p.h @@ -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); -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 QSizePolicy &sizePolicy); -Q_GUI_EXPORT QSize qSmartMinSize(const QWidgetItem *i); -Q_GUI_EXPORT QSize qSmartMinSize(const QWidget *w); -Q_GUI_EXPORT QSize qSmartMaxSize(const QSize &sizeHint, +Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidgetItem *i); +Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidget *w); +Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QSize &sizeHint, const QSize &minSize, const QSize &maxSize, const QSizePolicy &sizePolicy, Qt::Alignment align = 0); -Q_GUI_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 QWidgetItem *i, 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 diff --git a/src/widgets/kernel/qlayoutitem.h b/src/widgets/kernel/qlayoutitem.h index 92bd1afebb..d03f77654b 100644 --- a/src/widgets/kernel/qlayoutitem.h +++ b/src/widgets/kernel/qlayoutitem.h @@ -61,7 +61,7 @@ class QSpacerItem; class QWidget; class QSize; -class Q_GUI_EXPORT QLayoutItem +class Q_WIDGETS_EXPORT QLayoutItem { public: inline explicit QLayoutItem(Qt::Alignment alignment = 0); @@ -93,7 +93,7 @@ protected: inline QLayoutItem::QLayoutItem(Qt::Alignment aalignment) : align(aalignment) { } -class Q_GUI_EXPORT QSpacerItem : public QLayoutItem +class Q_WIDGETS_EXPORT QSpacerItem : public QLayoutItem { public: QSpacerItem(int w, int h, @@ -119,7 +119,7 @@ private: QRect rect; }; -class Q_GUI_EXPORT QWidgetItem : public QLayoutItem +class Q_WIDGETS_EXPORT QWidgetItem : public QLayoutItem { Q_DISABLE_COPY(QWidgetItem) @@ -141,7 +141,7 @@ protected: QWidget *wid; }; -class Q_GUI_EXPORT QWidgetItemV2 : public QWidgetItem +class Q_WIDGETS_EXPORT QWidgetItemV2 : public QWidgetItem { public: explicit QWidgetItemV2(QWidget *widget); diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h index bd92a91d58..76067604f9 100644 --- a/src/widgets/kernel/qsizepolicy.h +++ b/src/widgets/kernel/qsizepolicy.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) class QVariant; -class Q_GUI_EXPORT QSizePolicy +class Q_WIDGETS_EXPORT QSizePolicy { Q_GADGET Q_ENUMS(Policy) @@ -196,8 +196,8 @@ public: private: #ifndef QT_NO_DATASTREAM - friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &); - friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &); + friend Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &); + friend Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &); #endif QSizePolicy(int i) : data(i) { } @@ -222,8 +222,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSizePolicy::ControlTypes) #ifndef QT_NO_DATASTREAM // implemented in qlayout.cpp -Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &); -Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &); +Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &); +Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &); #endif inline void QSizePolicy::transpose() { diff --git a/src/widgets/kernel/qsound.h b/src/widgets/kernel/qsound.h index 48e57201f0..79fd241948 100644 --- a/src/widgets/kernel/qsound.h +++ b/src/widgets/kernel/qsound.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QSoundPrivate; -class Q_GUI_EXPORT QSound : public QObject +class Q_WIDGETS_EXPORT QSound : public QObject { Q_OBJECT diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h index 441a23ef8b..d895d139ab 100644 --- a/src/widgets/kernel/qstackedlayout.h +++ b/src/widgets/kernel/qstackedlayout.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) class QStackedLayoutPrivate; -class Q_GUI_EXPORT QStackedLayout : public QLayout +class Q_WIDGETS_EXPORT QStackedLayout : public QLayout { Q_OBJECT Q_DECLARE_PRIVATE(QStackedLayout) diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h index 506d084fd3..52fb962edb 100644 --- a/src/widgets/kernel/qtooltip.h +++ b/src/widgets/kernel/qtooltip.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) #ifndef QT_NO_TOOLTIP -class Q_GUI_EXPORT QToolTip +class Q_WIDGETS_EXPORT QToolTip { QToolTip(); public: diff --git a/src/widgets/kernel/qwhatsthis.h b/src/widgets/kernel/qwhatsthis.h index 0028a32545..b975b78e3e 100644 --- a/src/widgets/kernel/qwhatsthis.h +++ b/src/widgets/kernel/qwhatsthis.h @@ -58,7 +58,7 @@ class QAction; class QToolButton; #endif -class Q_GUI_EXPORT QWhatsThis +class Q_WIDGETS_EXPORT QWhatsThis { QWhatsThis(); diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 5788805ccb..6c92e0bb94 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -142,7 +142,7 @@ static bool qt_enable_backingstore = true; #endif #ifdef Q_WS_X11 // for compatibility with Qt 4.0 -Q_GUI_EXPORT void qt_x11_set_global_double_buffer(bool enable) +Q_WIDGETS_EXPORT void qt_x11_set_global_double_buffer(bool enable) { qt_enable_backingstore = enable; } @@ -12242,12 +12242,12 @@ void QWidgetPrivate::adjustQuitOnCloseAttribute() -Q_GUI_EXPORT QWidgetData *qt_qwidget_data(QWidget *widget) +Q_WIDGETS_EXPORT QWidgetData *qt_qwidget_data(QWidget *widget) { return widget->data; } -Q_GUI_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget) +Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget) { return widget->d_func(); } diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index de6effef92..47007726a8 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -145,7 +145,7 @@ public: class QWidgetPrivate; -class Q_GUI_EXPORT QWidget : public QObject, public QPaintDevice +class Q_WIDGETS_EXPORT QWidget : public QObject, public QPaintDevice { Q_OBJECT Q_DECLARE_PRIVATE(QWidget) @@ -803,8 +803,8 @@ private: friend void qt_set_winid_on_widget(QWidget*, Qt::HANDLE); #endif - friend Q_GUI_EXPORT QWidgetData *qt_qwidget_data(QWidget *widget); - friend Q_GUI_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget); + friend Q_WIDGETS_EXPORT QWidgetData *qt_qwidget_data(QWidget *widget); + friend Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget); private: Q_DISABLE_COPY(QWidget) diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index d39e318b36..cc894d514d 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -354,7 +354,7 @@ static inline bool bypassGraphicsProxyWidget(const QWidget *p) return false; } -class Q_GUI_EXPORT QWidgetPrivate : public QObjectPrivate +class Q_WIDGETS_EXPORT QWidgetPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QWidget) diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h index 22ed7c7d1c..31d58a819a 100644 --- a/src/widgets/kernel/qwidgetaction.h +++ b/src/widgets/kernel/qwidgetaction.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QWidgetActionPrivate; -class Q_GUI_EXPORT QWidgetAction : public QAction +class Q_WIDGETS_EXPORT QWidgetAction : public QAction { Q_OBJECT Q_DECLARE_PRIVATE(QWidgetAction) diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp index 680c8f9cfa..e4a9e0f067 100644 --- a/src/widgets/kernel/qwidgetsvariant.cpp +++ b/src/widgets/kernel/qwidgetsvariant.cpp @@ -191,7 +191,7 @@ static const QMetaTypeGuiHelper qVariantWidgetsHelper[] = { Q_IMPL_METATYPE_HELPER(QSizePolicy), }; -extern Q_GUI_EXPORT const QVariant::Handler *qt_widgets_variant_handler; +Q_WIDGETS_EXPORT const QVariant::Handler *qt_widgets_variant_handler; int qRegisterWidgetsVariant() { |