diff options
author | Olli Werwolff <qt-info@nokia.com> | 2011-06-08 09:51:07 +0200 |
---|---|---|
committer | Olli Werwolff <qt-info@nokia.com> | 2011-06-08 10:43:55 +0200 |
commit | 819f9ca965279562f34895dab405f28162c0b8ab (patch) | |
tree | 8e129b6846ec1762c5d33c4788be58abb29ad95b /src/widgets/platforms/mac | |
parent | 6a243e555901b4345fec83b064ff378863f2d147 (diff) |
Use Q_WIDGETS_EXPORT for widgets library
Reviewed-by: Lars Knoll
Diffstat (limited to 'src/widgets/platforms/mac')
-rw-r--r-- | src/widgets/platforms/mac/qcocoaview_mac_p.h | 2 | ||||
-rw-r--r-- | src/widgets/platforms/mac/qkeymapper_mac.cpp | 2 | ||||
-rw-r--r-- | src/widgets/platforms/mac/qmime_mac.cpp | 2 | ||||
-rw-r--r-- | src/widgets/platforms/mac/qpaintdevice_mac.cpp | 4 | ||||
-rw-r--r-- | src/widgets/platforms/mac/qpixmap_mac.cpp | 4 | ||||
-rw-r--r-- | src/widgets/platforms/mac/qregion_mac.cpp | 6 | ||||
-rw-r--r-- | src/widgets/platforms/mac/qt_mac_p.h | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/src/widgets/platforms/mac/qcocoaview_mac_p.h b/src/widgets/platforms/mac/qcocoaview_mac_p.h index e5e977bedd..963cbe06bf 100644 --- a/src/widgets/platforms/mac/qcocoaview_mac_p.h +++ b/src/widgets/platforms/mac/qcocoaview_mac_p.h @@ -61,7 +61,7 @@ QT_FORWARD_DECLARE_CLASS(QEvent); QT_FORWARD_DECLARE_CLASS(QString); QT_FORWARD_DECLARE_CLASS(QStringList); -Q_GUI_EXPORT +Q_WIDGETS_EXPORT @interface QT_MANGLE_NAMESPACE(QCocoaView) : NSControl <NSTextInput> { QWidget *qwidget; QWidgetPrivate *qwidgetprivate; diff --git a/src/widgets/platforms/mac/qkeymapper_mac.cpp b/src/widgets/platforms/mac/qkeymapper_mac.cpp index b5b3c4b5b9..e96caf1b9d 100644 --- a/src/widgets/platforms/mac/qkeymapper_mac.cpp +++ b/src/widgets/platforms/mac/qkeymapper_mac.cpp @@ -67,7 +67,7 @@ QT_USE_NAMESPACE bool qt_mac_eat_unicode_key = false; extern bool qt_sendSpontaneousEvent(QObject *obj, QEvent *event); //qapplication_mac.cpp -Q_GUI_EXPORT void qt_mac_secure_keyboard(bool b) +Q_WIDGETS_EXPORT void qt_mac_secure_keyboard(bool b) { static bool secure = false; if (b != secure){ diff --git a/src/widgets/platforms/mac/qmime_mac.cpp b/src/widgets/platforms/mac/qmime_mac.cpp index a1df34eb1f..0eaaaa8f2a 100644 --- a/src/widgets/platforms/mac/qmime_mac.cpp +++ b/src/widgets/platforms/mac/qmime_mac.cpp @@ -103,7 +103,7 @@ Q_GLOBAL_STATIC(QStringList, globalDraggedTypesList) \sa QMacPasteboardMime */ -Q_GUI_EXPORT void qRegisterDraggedTypes(const QStringList &types) +Q_WIDGETS_EXPORT void qRegisterDraggedTypes(const QStringList &types) { (*globalDraggedTypesList()) += types; } diff --git a/src/widgets/platforms/mac/qpaintdevice_mac.cpp b/src/widgets/platforms/mac/qpaintdevice_mac.cpp index 56cf8dc5a8..d29047bf50 100644 --- a/src/widgets/platforms/mac/qpaintdevice_mac.cpp +++ b/src/widgets/platforms/mac/qpaintdevice_mac.cpp @@ -85,7 +85,7 @@ float qt_mac_defaultDpi_y() \warning This function is only available on Mac OS X. */ -Q_GUI_EXPORT GrafPtr qt_mac_qd_context(const QPaintDevice *device) +Q_WIDGETS_EXPORT GrafPtr qt_mac_qd_context(const QPaintDevice *device) { if (device->devType() == QInternal::Pixmap) { return static_cast<GrafPtr>(static_cast<const QPixmap *>(device)->macQDHandle()); @@ -109,7 +109,7 @@ extern CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice *pdev); \warning This function is only available on Mac OS X. */ -Q_GUI_EXPORT CGContextRef qt_mac_cg_context(const QPaintDevice *pdev) +Q_WIDGETS_EXPORT CGContextRef qt_mac_cg_context(const QPaintDevice *pdev) { if (pdev->devType() == QInternal::Pixmap) { const QPixmap *pm = static_cast<const QPixmap*>(pdev); diff --git a/src/widgets/platforms/mac/qpixmap_mac.cpp b/src/widgets/platforms/mac/qpixmap_mac.cpp index cb3016177d..da08878427 100644 --- a/src/widgets/platforms/mac/qpixmap_mac.cpp +++ b/src/widgets/platforms/mac/qpixmap_mac.cpp @@ -72,7 +72,7 @@ extern QRegion qt_mac_convert_mac_region(RgnHandle rgn); //qregion_mac.cpp static int qt_pixmap_serial = 0; -Q_GUI_EXPORT quint32 *qt_mac_pixmap_get_base(const QPixmap *pix) +Q_WIDGETS_EXPORT quint32 *qt_mac_pixmap_get_base(const QPixmap *pix) { if (QApplicationPrivate::graphics_system_name == QLatin1String("raster")) return reinterpret_cast<quint32 *>(static_cast<QRasterPixmapData*>(pix->data.data())->buffer()->bits()); @@ -80,7 +80,7 @@ Q_GUI_EXPORT quint32 *qt_mac_pixmap_get_base(const QPixmap *pix) return static_cast<QMacPixmapData*>(pix->data.data())->pixels; } -Q_GUI_EXPORT int qt_mac_pixmap_get_bytes_per_line(const QPixmap *pix) +Q_WIDGETS_EXPORT int qt_mac_pixmap_get_bytes_per_line(const QPixmap *pix) { if (QApplicationPrivate::graphics_system_name == QLatin1String("raster")) return static_cast<QRasterPixmapData*>(pix->data.data())->buffer()->bytesPerLine(); diff --git a/src/widgets/platforms/mac/qregion_mac.cpp b/src/widgets/platforms/mac/qregion_mac.cpp index 3a0346abc4..94805a7f80 100644 --- a/src/widgets/platforms/mac/qregion_mac.cpp +++ b/src/widgets/platforms/mac/qregion_mac.cpp @@ -66,7 +66,7 @@ static void qt_mac_cleanup_rgncache() } #endif -Q_GUI_EXPORT RgnHandle qt_mac_get_rgn() +Q_WIDGETS_EXPORT RgnHandle qt_mac_get_rgn() { #ifdef RGN_CACHE_SIZE if(!rgncache_init) { @@ -90,7 +90,7 @@ Q_GUI_EXPORT RgnHandle qt_mac_get_rgn() return NewRgn(); } -Q_GUI_EXPORT void qt_mac_dispose_rgn(RgnHandle r) +Q_WIDGETS_EXPORT void qt_mac_dispose_rgn(RgnHandle r) { #ifdef RGN_CACHE_SIZE if(rgncache_init && rgncache_used < RGN_CACHE_SIZE) { @@ -116,7 +116,7 @@ static OSStatus qt_mac_get_rgn_rect(UInt16 msg, RgnHandle, const Rect *rect, voi return noErr; } -Q_GUI_EXPORT QRegion qt_mac_convert_mac_region(RgnHandle rgn) +Q_WIDGETS_EXPORT QRegion qt_mac_convert_mac_region(RgnHandle rgn) { return QRegion::fromQDRgn(rgn); } diff --git a/src/widgets/platforms/mac/qt_mac_p.h b/src/widgets/platforms/mac/qt_mac_p.h index 4625982062..80328c3497 100644 --- a/src/widgets/platforms/mac/qt_mac_p.h +++ b/src/widgets/platforms/mac/qt_mac_p.h @@ -138,7 +138,7 @@ public: void performFade(); }; -class Q_GUI_EXPORT QMacCocoaAutoReleasePool +class Q_WIDGETS_EXPORT QMacCocoaAutoReleasePool { private: void *pool; @@ -151,7 +151,7 @@ public: QString qt_mac_removeMnemonics(const QString &original); //implemented in qmacstyle_mac.cpp -class Q_GUI_EXPORT QMacWindowChangeEvent +class Q_WIDGETS_EXPORT QMacWindowChangeEvent { private: static QList<QMacWindowChangeEvent*> *change_events; |