diff options
| author | aavit <qt-info@nokia.com> | 2010-11-02 11:02:43 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-11-02 11:02:43 (GMT) |
| commit | 7c5259e91b4808424482f2a15838418bf4dcc00d (patch) | |
| tree | ba3b0b787333288c79a91ea4ea6a944fd7be7b6b /src/gui/painting/qregion.cpp | |
| parent | a893f18cdaf1681e76413cbf637827371ada5865 (diff) | |
| parent | 187185bf246b63f080cf2a59b6768756b399e72c (diff) | |
| download | Qt-7c5259e91b4808424482f2a15838418bf4dcc00d.zip Qt-7c5259e91b4808424482f2a15838418bf4dcc00d.tar.gz Qt-7c5259e91b4808424482f2a15838418bf4dcc00d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/gui/painting/qregion.cpp')
| -rw-r--r-- | src/gui/painting/qregion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index 3412f9b..c5d5dc9 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -1620,7 +1620,7 @@ QT_END_INCLUDE_NAMESPACE QT_BEGIN_INCLUDE_NAMESPACE # include "qregion_win.cpp" QT_END_INCLUDE_NAMESPACE -#elif defined(Q_WS_QWS) +#elif defined(Q_WS_QWS) || defined(Q_WS_QPA) static QRegionPrivate qrp; QRegion::QRegionData QRegion::shared_empty = {Q_BASIC_ATOMIC_INITIALIZER(1), &qrp}; #endif @@ -4231,7 +4231,7 @@ QRect QRegion::boundingRect() const Returns true if \a rect is guaranteed to be fully contained in \a region. A false return value does not guarantee the opposite. */ -#ifdef Q_WS_QWS +#if defined(Q_WS_QWS) || defined(Q_WS_QPA) Q_GUI_EXPORT #endif bool qt_region_strictContains(const QRegion ®ion, const QRect &rect) |