diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 03:15:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 03:15:02 (GMT) |
| commit | ebecf192abe56c405409343acc2f97eaf9124fc3 (patch) | |
| tree | f9a1c01e6a06dc51380eff2a010377a27cfcff10 | |
| parent | aba9a891da354a1fbbadbb3a70d90a66f47d3f1d (diff) | |
| parent | da8b7c8587a6d3c3214355f3d85a09c8693ceeee (diff) | |
| download | Qt-ebecf192abe56c405409343acc2f97eaf9124fc3.zip Qt-ebecf192abe56c405409343acc2f97eaf9124fc3.tar.gz Qt-ebecf192abe56c405409343acc2f97eaf9124fc3.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 issue for the Carbon build.
| -rw-r--r-- | src/gui/widgets/qmainwindowlayout_mac.mm | 3 | ||||
| -rw-r--r-- | src/gui/widgets/qmainwindowlayout_p.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm index dfde799..9e26423 100644 --- a/src/gui/widgets/qmainwindowlayout_mac.mm +++ b/src/gui/widgets/qmainwindowlayout_mac.mm @@ -474,6 +474,7 @@ void QMainWindowLayout::insertIntoMacToolbar(QToolBar *before, QToolBar *toolbar #endif } +#ifdef QT_MAC_USE_COCOA void QMainWindowLayout::updateUnifiedToolbarOffset() { QPoint offset(0, 0); @@ -483,6 +484,8 @@ void QMainWindowLayout::updateUnifiedToolbarOffset() qtoolbarsInUnifiedToolbarList.at(i)->d_func()->toolbar_offset = offset; } } +#endif // QT_MAC_USE_COCOA + void QMainWindowLayout::removeFromMacToolbar(QToolBar *toolbar) { diff --git a/src/gui/widgets/qmainwindowlayout_p.h b/src/gui/widgets/qmainwindowlayout_p.h index e457cbc..661d49d 100644 --- a/src/gui/widgets/qmainwindowlayout_p.h +++ b/src/gui/widgets/qmainwindowlayout_p.h @@ -335,7 +335,6 @@ public: QHash<QToolBar *, ToolBarSaveState> toolbarSaveState; QHash<QString, QToolBar *> cocoaItemIDToToolbarHash; void insertIntoMacToolbar(QToolBar *before, QToolBar *after); - void updateUnifiedToolbarOffset(); void removeFromMacToolbar(QToolBar *toolbar); void cleanUpMacToolbarItems(); void fixSizeInUnifiedToolbar(QToolBar *tb) const; @@ -346,6 +345,7 @@ public: #ifdef QT_MAC_USE_COCOA QUnifiedToolbarSurface *unifiedSurface; + void updateUnifiedToolbarOffset(); #endif // QT_MAC_USE_COCOA #endif // Q_WS_MAC |