Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I045587eac266e9b6296d9cd9e3c73031fe18bbd1

3 files changed, 6 insertions, 2 deletions

diff --git a/tools/qmlprofiler/qmlprofiler.pro b/tools/qmlprofiler/qmlprofiler.pro
index c5def993f3..b3833a83ab 100644
--- a/tools/qmlprofiler/qmlprofiler.pro
+++ b/tools/qmlprofiler/qmlprofiler.pro
@@ -1,4 +1,4 @@
-QT += qml qml-private v8-private network core-private
+QT = qml qml-private v8-private network core-private
 
 SOURCES += main.cpp \
     qmlprofilerapplication.cpp \
diff --git a/tools/qmlprofiler/qqmldebugclient.cpp b/tools/qmlprofiler/qqmldebugclient.cpp
index bb57594a3b..3ba8b334ff 100644
--- a/tools/qmlprofiler/qqmldebugclient.cpp
+++ b/tools/qmlprofiler/qqmldebugclient.cpp
@@ -308,7 +308,9 @@ void QQmlDebugConnection::flush()
 void QQmlDebugConnection::connectToHost(const QString &hostName, quint16 port)
 {
     QTcpSocket *socket = new QTcpSocket(d);
+#ifndef QT_NO_NETWORKPROXY
     socket->setProxy(QNetworkProxy::NoProxy);
+#endif
     d->device = socket;
     d->connectDeviceSignals();
     d->gotHello = false;
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index d572487218..8a48445d63 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -483,7 +483,9 @@ int main(int argc, char ** argv)
             QObject *topLevel = component->create();
             QQuickWindow *window = qobject_cast<QQuickWindow *>(topLevel);
             QQuickView* qxView = 0;
-            if (!window) {
+            if (window) {
+                engine.setIncubationController(window->incubationController());
+            } else {
                 QQuickItem *contentItem = qobject_cast<QQuickItem *>(topLevel);
                 if (contentItem) {
                     qxView = new QQuickView(&engine, NULL);