diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-21 08:16:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-21 08:16:05 (GMT) |
| commit | b8238ec7e41d483a9166eb7aebbf911f36976cdc (patch) | |
| tree | b3f8f08911714ccd653f1f2df4876cf2638b5090 /src/gui/painting | |
| parent | d28057dc6f282c2cc129eae40a4fb1555fef455c (diff) | |
| parent | 03c1445ed4be734a82cea59d107c51a4be43c5f4 (diff) | |
| download | Qt-b8238ec7e41d483a9166eb7aebbf911f36976cdc.zip Qt-b8238ec7e41d483a9166eb7aebbf911f36976cdc.tar.gz Qt-b8238ec7e41d483a9166eb7aebbf911f36976cdc.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix compilation with QT_NO_KEYWORDS
Replaced sample text for Japanese font
Fix the #ifdef position.
Deactivate the auto-test on problematic platforms.
Enable the unified toolbar with the raster
configure: Don't use character class when looking for QMAKE_CONF_COMPILER
Moving the resetInternalData slot to QAbstractProxyModel
Provide the resetInternalData slot to cleanly reset data in proxy subclasses.
Emit beginResetModel before updating the strings.
Send the hoverLeave not properly sent on the widget inside QGPW.
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qunifiedtoolbarsurface_mac.cpp | 4 | ||||
| -rw-r--r-- | src/gui/painting/qunifiedtoolbarsurface_mac_p.h | 4 | ||||
| -rw-r--r-- | src/gui/painting/qwindowsurface_raster.cpp | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp index 722355e..ab05dbd 100644 --- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp +++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp @@ -45,6 +45,8 @@ #include <QDebug> +#ifdef QT_MAC_USE_COCOA + QT_BEGIN_NAMESPACE QUnifiedToolbarSurface::QUnifiedToolbarSurface(QWidget *widget) @@ -231,3 +233,5 @@ void QUnifiedToolbarSurface::prepareBuffer(QImage::Format format, QWidget *widge } QT_END_NAMESPACE + +#endif // QT_MAC_USE_COCOA diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h index d7805e8..4d72ff9 100644 --- a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h +++ b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h @@ -58,6 +58,8 @@ #include <private/qwidget_p.h> #include <private/qnativeimage_p.h> +#ifdef QT_MAC_USE_COCOA + QT_BEGIN_NAMESPACE class QNativeImage; @@ -92,4 +94,6 @@ private: QT_END_NAMESPACE +#endif // QT_MAC_USE_COCOA + #endif // QUNIFIEDTOOLBARSURFACE_MAC_P_H diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp index 99f8597..217723f 100644 --- a/src/gui/painting/qwindowsurface_raster.cpp +++ b/src/gui/painting/qwindowsurface_raster.cpp @@ -251,6 +251,7 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi #ifdef Q_WS_MAC +#ifdef QT_MAC_USE_COCOA // Unified toolbar hack. QMainWindow* mWindow = qobject_cast<QMainWindow*>(widget->window()); if (mWindow) { @@ -267,6 +268,7 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi } } } +#endif // QT_MAC_USE_COCOA Q_UNUSED(offset); // Get a context for the widget. @@ -338,7 +340,8 @@ void QRasterWindowSurface::setGeometry(const QRect &rect) prepareBuffer(QNativeImage::systemFormat(), window()); } d->inSetGeometry = false; -#ifdef Q_WS_MAC + +#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA) QMainWindow* mWindow = qobject_cast<QMainWindow*>(window()); if (mWindow) { QMainWindowLayout *mLayout = qobject_cast<QMainWindowLayout*>(mWindow->layout()); @@ -354,7 +357,8 @@ void QRasterWindowSurface::setGeometry(const QRect &rect) } } } -#endif // Q_WS_MAC +#endif // Q_WS_MAC && QT_MAC_USE_COCOA + } // from qwindowsurface.cpp |