Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

mkspecs/features/cmake_functions.prf

@@ -27,9 +27,9 @@ defineReplace(cmakeModuleList) {
 
 defineReplace(cmakeTargetPath) {
     SYSR = $$[QT_SYSROOT]
-    !isEmpty(SYSR): path = $$relative_path($$1, $$[QT_SYSROOT])
+    !isEmpty(SYSR): path = /$$relative_path($$1, $$[QT_SYSROOT])
     else: path = $$1
-    return($$clean_path(/$$path))
+    return($$clean_path($$path))
 }
 
 defineReplace(cmakeTargetPaths) {

mkspecs/features/ctest_testcase_common.prf

@@ -1,10 +1,11 @@
 
 win32 {
-    CMAKE_VERSION = $$system(cmake --version 2>NUL)
+    CMAKE_VERSION = $$system(cmake --version 2>NUL, lines)
 } else {
-    CMAKE_VERSION = $$system(cmake --version 2>/dev/null)
+    CMAKE_VERSION = $$system(cmake --version 2>/dev/null, lines)
 }
 
+CMAKE_VERSION = $$member(CMAKE_VERSION, 0, 0)
 
 check.commands =
 QMAKE_EXTRA_TARGETS *= check

src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java

@@ -858,10 +858,8 @@ public class QtActivityDelegate
 
     public void onContextMenuClosed(Menu menu)
     {
-        if (!m_contextMenuVisible) {
-            Log.e(QtNative.QtTAG, "invalid onContextMenuClosed call");
+        if (!m_contextMenuVisible)
             return;
-        }
         m_contextMenuVisible = false;
         QtNative.onContextMenuClosed(menu);
     }

src/gui/text/qfontdatabase_qpa.cpp

@@ -184,7 +184,6 @@ QFontEngine *loadSingleEngine(int script,
     if (!engine) {
         engine = pfdb->fontEngine(def, QChar::Script(script), size->handle);
         if (engine) {
-            engine->smoothScalable = style->smoothScalable;
             QFontCache::Key key(def,script);
             QFontCache::instance()->instance()->insertEngine(key,engine);
         }

src/gui/text/qfontengine.cpp

@@ -208,8 +208,7 @@ Q_AUTOTEST_EXPORT QList<QFontEngine *> QFontEngine_stopCollectingEngines()
 QFontEngine::QFontEngine()
     : ref(0),
       font_(0), font_destroy_func(0),
-      face_(0), face_destroy_func(0),
-      smoothScalable(false)
+      face_(0), face_destroy_func(0)
 {
     cache_cost = 0;
     fsType = 0;

src/gui/text/qfontengine_p.h

@@ -302,8 +302,6 @@ public:
 
     inline QVariant userData() const { return m_userData; }
 
-    bool smoothScalable;
-
 protected:
     QFixed lastRightBearing(const QGlyphLayout &glyphs, bool round = false);
 

src/plugins/bearer/corewlan/qcorewlanengine.mm

@@ -71,7 +71,7 @@ extern "C" { // Otherwise it won't find CWKeychain* symbols at link time
     QCoreWlanEngine *engine;
     NSLock *locker;
 }
-- (void)notificationHandler;//:(NSNotification *)notification;
+- (void)notificationHandler:(NSNotification *)notification;
 - (void)remove;
 - (void)setEngine:(QCoreWlanEngine *)coreEngine;
 - (QCoreWlanEngine *)engine;
@@ -120,8 +120,9 @@ extern "C" { // Otherwise it won't find CWKeychain* symbols at link time
     [locker unlock];
 }
 
-- (void)notificationHandler//:(NSNotification *)notification
+- (void)notificationHandler:(NSNotification *)notification
 {
+    Q_UNUSED(notification);
     engine->requestUpdate();
 }
 @end

src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm

@@ -48,7 +48,7 @@
     QCoreWlanEngine *engine;
     NSLock *locker;
 }
-- (void)notificationHandler;//:(NSNotification *)notification;
+- (void)notificationHandler:(NSNotification *)notification;
 - (void)remove;
 - (void)setEngine:(QCoreWlanEngine *)coreEngine;
 - (QCoreWlanEngine *)engine;
@@ -97,8 +97,9 @@
     [locker unlock];
 }
 
-- (void)notificationHandler//:(NSNotification *)notification
+- (void)notificationHandler:(NSNotification *)notification
 {
+    Q_UNUSED(notification);
     engine->requestUpdate();
 }
 @end

src/plugins/platforms/qnx/qqnxnativeinterface.cpp

@@ -54,11 +54,13 @@ QT_BEGIN_NAMESPACE
 void *QQnxNativeInterface::nativeResourceForWindow(const QByteArray &resource, QWindow *window)
 {
     if (resource == "windowGroup" && window && window->screen()) {
-        const QQnxScreen * const screen = static_cast<QQnxScreen *>(window->screen()->handle());
+        QQnxScreen * const screen = static_cast<QQnxScreen *>(window->screen()->handle());
         if (screen) {
+            screen_window_t screenWindow = reinterpret_cast<screen_window_t>(window->winId());
+            QQnxWindow *qnxWindow = screen->findWindow(screenWindow);
             // We can't just call data() instead of constData() here, since that would detach
             // and the lifetime of the char * would not be long enough. Therefore the const_cast.
-            return const_cast<char *>(screen->rootWindow()->groupName().constData());
+            return qnxWindow ? const_cast<char *>(qnxWindow->groupName().constData()) : 0;
         }
     }
 

src/widgets/graphicsview/qgraphicsitem.cpp

@@ -1414,7 +1414,10 @@ QGraphicsItem::~QGraphicsItem()
         QObjectPrivate *p = QObjectPrivate::get(o);
         p->wasDeleted = true;
         if (p->declarativeData) {
-            QAbstractDeclarativeData::destroyed(p->declarativeData, o);
+            if (QAbstractDeclarativeData::destroyed)
+                QAbstractDeclarativeData::destroyed(p->declarativeData, o);
+            if (QAbstractDeclarativeData::destroyed_qml1)
+                QAbstractDeclarativeData::destroyed_qml1(p->declarativeData, o);
             p->declarativeData = 0;
         }
     }

src/widgets/kernel/qwidget.cpp

@@ -1464,7 +1464,10 @@ QWidget::~QWidget()
     }
 
     if (d->declarativeData) {
-        QAbstractDeclarativeData::destroyed(d->declarativeData, this);
+        if (QAbstractDeclarativeData::destroyed)
+            QAbstractDeclarativeData::destroyed(d->declarativeData, this);
+        if (QAbstractDeclarativeData::destroyed_qml1)
+            QAbstractDeclarativeData::destroyed_qml1(d->declarativeData, this);
         d->declarativeData = 0;                 // don't activate again in ~QObject
     }