summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gui/graphicsview/qgraphicslinearlayout.cpp10
-rw-r--r--src/gui/graphicsview/qgraphicslinearlayout.h2
-rw-r--r--src/gui/kernel/qwidget_s60.cpp9
-rw-r--r--src/gui/styles/qstyle.cpp4
-rw-r--r--src/gui/styles/qstyle.h2
-rw-r--r--src/gui/styles/qstyleoption.cpp10
-rw-r--r--src/gui/styles/qstyleoption.h2
-rw-r--r--src/s60installs/eabi/QtGuiu.def48
8 files changed, 58 insertions, 29 deletions
diff --git a/src/gui/graphicsview/qgraphicslinearlayout.cpp b/src/gui/graphicsview/qgraphicslinearlayout.cpp
index 7ff7c9b..5684f0e 100644
--- a/src/gui/graphicsview/qgraphicslinearlayout.cpp
+++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp
@@ -59,7 +59,7 @@
You can add widgets, layouts, stretches (addStretch(), insertStretch() or
setStretchFactor()), and spacings (setItemSpacing()) to a linear
- layout. The layout takes ownership of the items. In some cases when the layout
+ layout. The layout takes ownership of the items. In some cases when the layout
item also inherits from QGraphicsItem (such as QGraphicsWidget) there will be a
ambiguity in ownership because the layout item belongs to two ownership hierarchies.
See the documentation of QGraphicsLayoutItem::setOwnedByLayout() how to handle
@@ -208,7 +208,7 @@ QGraphicsLinearLayout::~QGraphicsLinearLayout()
for (int i = count() - 1; i >= 0; --i) {
QGraphicsLayoutItem *item = itemAt(i);
// The following lines can be removed, but this removes the item
- // from the layout more efficiently than the implementation of
+ // from the layout more efficiently than the implementation of
// ~QGraphicsLayoutItem.
removeAt(i);
if (item) {
@@ -542,18 +542,18 @@ void QGraphicsLinearLayout::invalidate()
QGraphicsLayout::invalidate();
}
-#ifdef QT_DEBUG
void QGraphicsLinearLayout::dump(int indent) const
{
+#ifdef QT_DEBUG
if (qt_graphicsLayoutDebug()) {
Q_D(const QGraphicsLinearLayout);
qDebug("%*s%s layout", indent, "",
d->orientation == Qt::Horizontal ? "Horizontal" : "Vertical");
d->engine.dump(indent + 1);
}
-}
#endif
+}
QT_END_NAMESPACE
-
+
#endif //QT_NO_GRAPHICSVIEW
diff --git a/src/gui/graphicsview/qgraphicslinearlayout.h b/src/gui/graphicsview/qgraphicslinearlayout.h
index 742392e..15fe81a 100644
--- a/src/gui/graphicsview/qgraphicslinearlayout.h
+++ b/src/gui/graphicsview/qgraphicslinearlayout.h
@@ -97,9 +97,7 @@ public:
Q5SizePolicy::ControlTypes controlTypes(LayoutSide side) const;
#endif
-#ifdef QT_DEBUG
void dump(int indent = 0) const;
-#endif
protected:
#if 0
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index abf5ba5..cb615fe 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -564,8 +564,13 @@ void QWidgetPrivate::lower_sys()
Q_Q(QWidget);
Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
- if (q->internalWinId())
- q->internalWinId()->DrawableWindow()->SetOrdinalPosition(-1);
+ if (q->internalWinId()) {
+ // If toplevel widget, lower app to background
+ if (q->isWindow())
+ S60->wsSession().SetWindowGroupOrdinalPosition(S60->windowGroup().Identifier(), -1);
+ else
+ q->internalWinId()->DrawableWindow()->SetOrdinalPosition(-1);
+ }
if (!q->isWindow())
invalidateBuffer(q->rect());
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index eef1573..ec238a9 100644
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -2417,13 +2417,13 @@ int QStyle::layoutSpacingImplementation(QSizePolicy::ControlType /* control1 */,
return -1;
}
-#if !defined(QT_NO_DEBUG) && !defined(QT_NO_DEBUG_STREAM)
QT_BEGIN_INCLUDE_NAMESPACE
#include <QDebug>
QT_END_INCLUDE_NAMESPACE
QDebug operator<<(QDebug debug, QStyle::State state)
{
+#if !defined(QT_NO_DEBUG) && !defined(QT_NO_DEBUG_STREAM)
debug << "QStyle::State(";
QStringList states;
@@ -2455,9 +2455,9 @@ QDebug operator<<(QDebug debug, QStyle::State state)
qSort(states);
debug << states.join(QLatin1String(" | "));
debug << ')';
+#endif
return debug;
}
-#endif
/*!
\since 4.6
diff --git a/src/gui/styles/qstyle.h b/src/gui/styles/qstyle.h
index 1f8d5c8..0014954 100644
--- a/src/gui/styles/qstyle.h
+++ b/src/gui/styles/qstyle.h
@@ -878,9 +878,7 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(QStyle::State)
Q_DECLARE_OPERATORS_FOR_FLAGS(QStyle::SubControls)
-#if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_NO_DEBUG)
Q_GUI_EXPORT QDebug operator<<(QDebug debug, QStyle::State state);
-#endif
QT_END_NAMESPACE
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp
index 10a6b5b..061afcc 100644
--- a/src/gui/styles/qstyleoption.cpp
+++ b/src/gui/styles/qstyleoption.cpp
@@ -45,9 +45,7 @@
# include "private/qt_mac_p.h"
# include "qmacstyle_mac.h"
#endif
-#ifndef QT_NO_DEBUG
#include <qdebug.h>
-#endif
#include <QtCore/qmath.h>
QT_BEGIN_NAMESPACE
@@ -1254,7 +1252,7 @@ QStyleOptionViewItemV4::QStyleOptionViewItemV4(int version)
\brief the features of the group box frame
The frame is flat by default.
-
+
\sa QStyleOptionFrameV2::FrameFeature
*/
@@ -5298,9 +5296,9 @@ QStyleHintReturnVariant::QStyleHintReturnVariant() : QStyleHintReturn(Version, T
Returns a T or 0 depending on the type of \a hint.
*/
-#if !defined(QT_NO_DEBUG) && !defined(QT_NO_DEBUG_STREAM)
QDebug operator<<(QDebug debug, const QStyleOption::OptionType &optionType)
{
+#if !defined(QT_NO_DEBUG) && !defined(QT_NO_DEBUG_STREAM)
switch (optionType) {
case QStyleOption::SO_Default:
debug << "SO_Default"; break;
@@ -5361,19 +5359,21 @@ QDebug operator<<(QDebug debug, const QStyleOption::OptionType &optionType)
case QStyleOption::SO_GraphicsItem:
debug << "SO_GraphicsItem"; break;
}
+#endif
return debug;
}
QDebug operator<<(QDebug debug, const QStyleOption &option)
{
+#if !defined(QT_NO_DEBUG) && !defined(QT_NO_DEBUG_STREAM)
debug << "QStyleOption(";
debug << QStyleOption::OptionType(option.type);
debug << ',' << (option.direction == Qt::RightToLeft ? "RightToLeft" : "LeftToRight");
debug << ',' << option.state;
debug << ',' << option.rect;
debug << ')';
+#endif
return debug;
}
-#endif
QT_END_NAMESPACE
diff --git a/src/gui/styles/qstyleoption.h b/src/gui/styles/qstyleoption.h
index 2860664..bf8b479 100644
--- a/src/gui/styles/qstyleoption.h
+++ b/src/gui/styles/qstyleoption.h
@@ -938,10 +938,8 @@ T qstyleoption_cast(QStyleHintReturn *hint)
return 0;
}
-#if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_NO_DEBUG)
Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QStyleOption::OptionType &optionType);
Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QStyleOption &option);
-#endif
QT_END_NAMESPACE
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 1f4be7a..ae69475 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -1511,13 +1511,13 @@ EXPORTS
_ZN12QApplication13startDragTimeEv @ 1510 NONAME
_ZN12QApplication14navigationModeEv @ 1511 NONAME
_ZN12QApplication14overrideCursorEv @ 1512 NONAME
- _ZN12QApplication14s60EventFilterEP8TWsEvent @ 1513 NONAME
+ _ZN12QApplication14s60EventFilterEP8TWsEvent @ 1513 NONAME ABSENT
_ZN12QApplication14setGlobalStrutERK5QSize @ 1514 NONAME
_ZN12QApplication15closeAllWindowsEv @ 1515 NONAME
_ZN12QApplication15cursorFlashTimeEv @ 1516 NONAME
_ZN12QApplication15isEffectEnabledEN2Qt8UIEffectE @ 1517 NONAME
_ZN12QApplication15layoutDirectionEv @ 1518 NONAME
- _ZN12QApplication15s60ProcessEventEP8TWsEvent @ 1519 NONAME
+ _ZN12QApplication15s60ProcessEventEP8TWsEvent @ 1519 NONAME ABSENT
_ZN12QApplication15setActiveWindowEP7QWidget @ 1520 NONAME
_ZN12QApplication15setInputContextEP13QInputContext @ 1521 NONAME
_ZN12QApplication15topLevelWidgetsEv @ 1522 NONAME
@@ -1546,10 +1546,10 @@ EXPORTS
_ZN12QApplication20changeOverrideCursorERK7QCursor @ 1545 NONAME
_ZN12QApplication20desktopSettingsAwareEv @ 1546 NONAME
_ZN12QApplication20setStartDragDistanceEi @ 1547 NONAME
- _ZN12QApplication20symbianHandleCommandEi @ 1548 NONAME
+ _ZN12QApplication20symbianHandleCommandEi @ 1548 NONAME ABSENT
_ZN12QApplication21keyboardInputIntervalEv @ 1549 NONAME
_ZN12QApplication21restoreOverrideCursorEv @ 1550 NONAME
- _ZN12QApplication21symbianResourceChangeEi @ 1551 NONAME
+ _ZN12QApplication21symbianResourceChangeEi @ 1551 NONAME ABSENT
_ZN12QApplication22keyboardInputDirectionEv @ 1552 NONAME
_ZN12QApplication22quitOnLastWindowClosedEv @ 1553 NONAME
_ZN12QApplication22setDoubleClickIntervalEi @ 1554 NONAME
@@ -2458,7 +2458,7 @@ EXPORTS
_ZN13QInputContext11qt_metacallEN11QMetaObject4CallEiPPv @ 2457 NONAME
_ZN13QInputContext11qt_metacastEPKc @ 2458 NONAME
_ZN13QInputContext12mouseHandlerEiP11QMouseEvent @ 2459 NONAME
- _ZN13QInputContext14s60FilterEventEP7QWidgetP8TWsEvent @ 2460 NONAME
+ _ZN13QInputContext14s60FilterEventEP7QWidgetP8TWsEvent @ 2460 NONAME ABSENT
_ZN13QInputContext14setFocusWidgetEP7QWidget @ 2461 NONAME
_ZN13QInputContext15widgetDestroyedEP7QWidget @ 2462 NONAME
_ZN13QInputContext16staticMetaObjectE @ 2463 NONAME DATA 16
@@ -3141,7 +3141,7 @@ EXPORTS
_ZN14QWidgetPrivate25setLayoutDirection_helperEN2Qt15LayoutDirectionE @ 3140 NONAME
_ZN14QWidgetPrivate26adjustQuitOnCloseAttributeEv @ 3141 NONAME
_ZN14QWidgetPrivate26createDefaultWindowSurfaceEv @ 3142 NONAME
- _ZN14QWidgetPrivate26nearestGraphicsProxyWidgetEP7QWidget @ 3143 NONAME
+ _ZN14QWidgetPrivate26nearestGraphicsProxyWidgetEPK7QWidget @ 3143 NONAME
_ZN14QWidgetPrivate27widgetInNavigationDirectionENS_9DirectionE @ 3144 NONAME
_ZN14QWidgetPrivate29invalidateBuffer_resizeHelperERK6QPointRK5QSize @ 3145 NONAME
_ZN14QWidgetPrivate30createDefaultWindowSurface_sysEv @ 3146 NONAME
@@ -5215,11 +5215,11 @@ EXPORTS
_ZN24QGraphicsSceneWheelEventD1Ev @ 5214 NONAME
_ZN24QGraphicsSceneWheelEventD2Ev @ 5215 NONAME
_ZN24QImagePixmapCleanupHooks12addImageHookEPFvxE @ 5216 NONAME
- _ZN24QImagePixmapCleanupHooks13addPixmapHookEPFvP7QPixmapE @ 5217 NONAME
+ _ZN24QImagePixmapCleanupHooks13addPixmapHookEPFvP7QPixmapE @ 5217 NONAME ABSENT
_ZN24QImagePixmapCleanupHooks15removeImageHookEPFvxE @ 5218 NONAME
- _ZN24QImagePixmapCleanupHooks16removePixmapHookEPFvP7QPixmapE @ 5219 NONAME
+ _ZN24QImagePixmapCleanupHooks16removePixmapHookEPFvP7QPixmapE @ 5219 NONAME ABSENT
_ZN24QImagePixmapCleanupHooks17executeImageHooksEx @ 5220 NONAME
- _ZN24QImagePixmapCleanupHooks18executePixmapHooksEP7QPixmap @ 5221 NONAME
+ _ZN24QImagePixmapCleanupHooks18executePixmapHooksEP7QPixmap @ 5221 NONAME ABSENT
_ZN24QImagePixmapCleanupHooks8instanceEv @ 5222 NONAME
_ZN24QImagePixmapCleanupHooksC1Ev @ 5223 NONAME
_ZN24QImagePixmapCleanupHooksC2Ev @ 5224 NONAME
@@ -11585,4 +11585,34 @@ EXPORTS
_ZN14QWidgetPrivate17_q_delayedDestroyEP11CCoeControl @ 11584 NONAME
_ZN14QWidgetPrivate21activateSymbianWindowEP11CCoeControl @ 11585 NONAME
_ZNK17QRasterPixmapData26createCompatiblePixmapDataEv @ 11586 NONAME
+ _ZN12QApplication18symbianEventFilterEPK13QSymbianEvent @ 11587 NONAME
+ _ZN12QApplication19symbianProcessEventEPK13QSymbianEvent @ 11588 NONAME
+ _ZN13QInputContext18symbianFilterEventEP7QWidgetPK13QSymbianEvent @ 11589 NONAME
+ _ZN13QSymbianEventC1ENS_4TypeEi @ 11590 NONAME
+ _ZN13QSymbianEventC1EPK8TWsEvent @ 11591 NONAME
+ _ZN13QSymbianEventC2ENS_4TypeEi @ 11592 NONAME
+ _ZN13QSymbianEventC2EPK8TWsEvent @ 11593 NONAME
+ _ZN13QSymbianEventD1Ev @ 11594 NONAME
+ _ZN13QSymbianEventD2Ev @ 11595 NONAME
+ _ZN15QGraphicsAnchor13setSizePolicyEN11QSizePolicy6PolicyE @ 11596 NONAME
+ _ZN19QApplicationPrivate20symbianHandleCommandEi @ 11597 NONAME
+ _ZN19QApplicationPrivate21symbianProcessWsEventEPK8TWsEvent @ 11598 NONAME
+ _ZN19QApplicationPrivate21symbianResourceChangeEi @ 11599 NONAME
+ _ZN24QImagePixmapCleanupHooks24addPixmapDestructionHookEPFvP7QPixmapE @ 11600 NONAME
+ _ZN24QImagePixmapCleanupHooks25addPixmapModificationHookEPFvP7QPixmapE @ 11601 NONAME
+ _ZN24QImagePixmapCleanupHooks27removePixmapDestructionHookEPFvP7QPixmapE @ 11602 NONAME
+ _ZN24QImagePixmapCleanupHooks28removePixmapModificationHookEPFvP7QPixmapE @ 11603 NONAME
+ _ZN24QImagePixmapCleanupHooks29executePixmapDestructionHooksEP7QPixmap @ 11604 NONAME
+ _ZN24QImagePixmapCleanupHooks30executePixmapModificationHooksEP7QPixmap @ 11605 NONAME
+ _ZNK11QPixmapData26createCompatiblePixmapDataEv @ 11606 NONAME
+ _ZNK13QSymbianEvent17windowServerEventEv @ 11607 NONAME
+ _ZNK13QSymbianEvent18resourceChangeTypeEv @ 11608 NONAME
+ _ZNK13QSymbianEvent7commandEv @ 11609 NONAME
+ _ZNK15QGraphicsAnchor10sizePolicyEv @ 11610 NONAME
+ _ZNK21QGraphicsLinearLayout4dumpEi @ 11611 NONAME
+ _Zls6QDebug6QFlagsIN6QStyle9StateFlagEE @ 11612 NONAME
+ _Zls6QDebugRK12QStyleOption @ 11613 NONAME
+ _Zls6QDebugRKN12QStyleOption10OptionTypeE @ 11614 NONAME
+ _ZNK14QDesktopWidget14screenGeometryEPK7QWidget @ 11615 NONAME
+ _ZNK14QDesktopWidget17availableGeometryEPK7QWidget @ 11616 NONAME
generated by cgit v0.12 at 2025-08-07 04:38:50 (GMT)