diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-17 17:07:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-17 17:07:55 (GMT) |
| commit | 4f33dbd5361c0875f39518b762a764478f04dd30 (patch) | |
| tree | 0ac6715405dba0e08cefa5a3d07241fe01a93445 /src/gui/kernel | |
| parent | 502f0e852b7e4ef00162246568d7cb7e2dfcae58 (diff) | |
| parent | fa373ee165b32b712690656a5f69f862292a2c1e (diff) | |
| download | Qt-4f33dbd5361c0875f39518b762a764478f04dd30.zip Qt-4f33dbd5361c0875f39518b762a764478f04dd30.tar.gz Qt-4f33dbd5361c0875f39518b762a764478f04dd30.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Export qt_directfb_.* functions in plugin as well
Added autotest for QPixmap::size() with null pixmaps.
Update Symbian def files.
QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect().
Wrong bounding rect returned by QGraphicsEffect::boundingRect().
Compile on Mac
Ensure building of WebKit and QtConcurrent are disabled with SunCC.
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 159c45d..1e2aa9f 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -114,6 +114,9 @@ QT_BEGIN_NAMESPACE +// qmainwindow.cpp +extern QMainWindowLayout *qt_mainwindow_layout(const QMainWindow *window); + #define XCOORD_MAX 16383 #define WRECT_MAX 8191 |