diff options
| author | Pulse Build System <qt-info@nokia.com> | 2010-01-26 08:32:48 (GMT) |
|---|---|---|
| committer | Pulse Build System <qt-info@nokia.com> | 2010-01-26 08:32:48 (GMT) |
| commit | 8cb85d5cb47f06f01f70781e9762a716cabdc73a (patch) | |
| tree | 1d7156448c12502854f13f8d51b56db972a67725 | |
| parent | ede20ecdb0ddef7ef239900eb3bfa92ca859e010 (diff) | |
| parent | b6a2ce7b02951aab761ddc8ffa022bbd8f19fa83 (diff) | |
| download | Qt-8cb85d5cb47f06f01f70781e9762a716cabdc73a.zip Qt-8cb85d5cb47f06f01f70781e9762a716cabdc73a.tar.gz Qt-8cb85d5cb47f06f01f70781e9762a716cabdc73a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1:
Carbon: fix build breakage on carbon
Remove statusbaritem on Mac OSX
doc: added part of Andy's update.
Fix the tablet device recognition on Windows
Fix S60 input method not showing up in editable QGraphicsTextItems
| -rw-r--r-- | doc/src/getting-started/installation.qdoc | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index 5f95c5a..3088892 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -740,9 +740,9 @@ If you are using pre-built binaries, follow the instructions given in the \l{http://www.microsoft.com/downloads/details.aspx?FamilyId=BB4A75AB-E2D4-4C96-B39D-37BAF6B5B1DC&displaylang=en}{here} to avoid runtime conflicts. - If you are using a source code package of Qt, you must first install Perl so + If you are using a source edition of Qt, you must first install Perl so that the syncqt script invoked by configure can be executed. You can download - this \l{http://www.activestate/downloads/}{here}. + this \l{http://www.activestate.com/downloads/}{here}. To build Qt with Phonon on Windows, you require: diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index d52ac77..20c0cde 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -3463,7 +3463,9 @@ void QWidgetPrivate::hide_sys() QMacCocoaAutoReleasePool pool; if(q->isWindow()) { +#ifdef QT_MAC_USE_COCOA setSubWindowStacking(false); +#endif OSWindowRef window = qt_mac_window_for(q); if(qt_mac_is_macsheet(q)) { #ifndef QT_MAC_USE_COCOA diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 833708e..083f730 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -3144,7 +3144,6 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai p->drawLine(opt->rect.topLeft(), opt->rect.bottomLeft()); } break; case PE_FrameStatusBarItem: - QCommonStyle::drawPrimitive(pe, opt, p, w); break; case PE_IndicatorTabClose: { bool hover = (opt->state & State_MouseOver); |