Hello community, here is the log from the commit of package libqt5-qtquickcontrols for openSUSE:Factory checked in at 2014-09-18 07:56:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtquickcontrols (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtquickcontrols.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtquickcontrols" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtquickcontrols/libqt5-qtquickcontrols.changes 2014-09-07 11:10:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtquickcontrols.new/libqt5-qtquickcontrols.changes 2014-09-18 07:56:55.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 16 11:27:53 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.3.2 final + * No changes since previous snapshot + * Use official tars + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtquickcontrols.spec ++++++ --- /var/tmp/diff_new_pack.5hvJL8/_old 2014-09-18 07:56:56.000000000 +0200 +++ /var/tmp/diff_new_pack.5hvJL8/_new 2014-09-18 07:56:56.000000000 +0200 @@ -16,10 +16,10 @@ # -%define qt5_snapshot 1 +%define qt5_snapshot 0 Name: libqt5-qtquickcontrols -Version: 5.3.2~git20140904 +Version: 5.3.2 Release: 0 Summary: Qt 5 Quick Controls Addon License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 ++++++ qtquickcontrols-opensource-src-5.3.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickcontrols-opensource-src-5.3.2/.tag new/qtquickcontrols-opensource-src-5.3.2/.tag --- old/qtquickcontrols-opensource-src-5.3.2/.tag 2014-09-05 14:23:37.000000000 +0200 +++ new/qtquickcontrols-opensource-src-5.3.2/.tag 2014-09-11 12:47:53.000000000 +0200 @@ -1 +1 @@ -a7d03f54eeac78326753fa069b6a60557201904f +d70e5ebe11a8eb22fe5e71945982d81991dc9f09 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow.cpp new/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow.cpp --- old/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow.cpp 2014-09-05 14:23:37.000000000 +0200 +++ new/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow.cpp 2014-09-11 12:47:53.000000000 +0200 @@ -50,8 +50,10 @@ QT_BEGIN_NAMESPACE QQuickMenuPopupWindow::QQuickMenuPopupWindow() : - QQuickPopupWindow(), m_itemAt(0) -{ } + m_itemAt(0), + m_logicalParentWindow(0) +{ +} void QQuickMenuPopupWindow::show() { @@ -59,6 +61,10 @@ // show() will reposition the popup at the last moment, // so its initial position must be captured after the call. m_initialPos = position(); + if (m_logicalParentWindow && m_logicalParentWindow->parent()) { + // This must be a QQuickWindow embedded via createWindowContainer. + m_initialPos += m_logicalParentWindow->geometry().topLeft(); + } } void QQuickMenuPopupWindow::setParentItem(QQuickItem *item) @@ -88,8 +94,11 @@ void QQuickMenuPopupWindow::setParentWindow(QWindow *effectiveParentWindow, QQuickWindow *parentWindow) { + while (effectiveParentWindow && effectiveParentWindow->parent()) + effectiveParentWindow = effectiveParentWindow->parent(); if (transientParent() != effectiveParentWindow) setTransientParent(effectiveParentWindow); + m_logicalParentWindow = parentWindow; if (parentWindow) { connect(parentWindow, SIGNAL(destroyed()), this, SLOT(dismissPopup())); if (QQuickMenuPopupWindow *pw = qobject_cast<QQuickMenuPopupWindow *>(parentWindow)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow_p.h new/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow_p.h --- old/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow_p.h 2014-09-05 14:23:37.000000000 +0200 +++ new/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickmenupopupwindow_p.h 2014-09-11 12:47:53.000000000 +0200 @@ -69,6 +69,7 @@ QQuickItem *m_itemAt; QPointF m_oldItemPos; QPointF m_initialPos; + QQuickWindow *m_logicalParentWindow; }; QT_END_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickpopupwindow.cpp new/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickpopupwindow.cpp --- old/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickpopupwindow.cpp 2014-09-05 14:23:37.000000000 +0200 +++ new/qtquickcontrols-opensource-src-5.3.2/src/controls/qquickpopupwindow.cpp 2014-09-11 12:47:53.000000000 +0200 @@ -68,23 +68,16 @@ { qreal posx = x(); qreal posy = y(); - if (QQuickWindow *parentWindow = qobject_cast<QQuickWindow *>(transientParent())) { + // transientParent may not be a QQuickWindow when embedding into widgets + if (QWindow *tp = transientParent()) { if (m_parentItem) { - QPointF pos = m_parentItem->mapToItem(parentWindow->contentItem(), QPointF(posx, posy)); + QPointF pos = m_parentItem->mapToItem(m_parentItem->window()->contentItem(), QPointF(posx, posy)); posx = pos.x(); posy = pos.y(); } - - if (parentWindow->parent()) { - // If the parent window is embedded in another window, the offset needs to be relative to - // its top-level window container, or to global coordinates, which is the same in the end. - QPoint parentWindowOffset = parentWindow->mapToGlobal(QPoint()); - posx += parentWindowOffset.x(); - posy += parentWindowOffset.y(); - } else { - posx += parentWindow->geometry().left(); - posy += parentWindow->geometry().top(); - } + QPoint tlwOffset = tp->mapToGlobal(QPoint()); + posx += tlwOffset.x(); + posy += tlwOffset.y(); } else if (m_parentItem && m_parentItem->window()) { QPoint offset; QQuickWindow *quickWindow = m_parentItem->window(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org