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

Conflicts:
	.qmake.conf
	src/imports/dialogs/DefaultFileDialog.qml
	src/imports/widgets/qquickqfiledialog.cpp

Change-Id: I00de6dd05cb773f01254061d585a82c90b229acd

2 files changed, 8 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp
index b4ace17738..20894944f3 100644
--- a/src/qml/qml/qqmlapplicationengine.cpp
+++ b/src/qml/qml/qqmlapplicationengine.cpp
@@ -60,7 +60,7 @@ QQmlApplicationEnginePrivate::~QQmlApplicationEnginePrivate()
 void QQmlApplicationEnginePrivate::cleanUp()
 {
     qDeleteAll(objects);
-#ifndef QT_NO_TRANSLATIONS
+#ifndef QT_NO_TRANSLATION
     qDeleteAll(translators);
 #endif
 }
@@ -71,7 +71,7 @@ void QQmlApplicationEnginePrivate::init()
     q->connect(&statusMapper, SIGNAL(mapped(QObject*)),
             q, SLOT(_q_finishLoad(QObject*)));
     q->connect(q, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
-#ifndef QT_NO_TRANSLATIONS
+#ifndef QT_NO_TRANSLATION
     QTranslator* qtTranslator = new QTranslator;
     if (qtTranslator->load(QLatin1String("qt_") + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
         QCoreApplication::installTranslator(qtTranslator);
@@ -83,7 +83,7 @@ void QQmlApplicationEnginePrivate::init()
 
 void QQmlApplicationEnginePrivate::loadTranslations(const QUrl &rootFile)
 {
-#ifndef QT_NO_TRANSLATIONS
+#ifndef QT_NO_TRANSLATION
     if (rootFile.scheme() != QLatin1String("file") && rootFile.scheme() != QLatin1String("qrc"))
         return;
 
@@ -96,6 +96,8 @@ void QQmlApplicationEnginePrivate::loadTranslations(const QUrl &rootFile)
     } else {
         delete translator;
     }
+#else
+    Q_UNUSED(rootFile)
 #endif
 }
 
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 0409b92e89..67b7e789bd 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -1432,7 +1432,9 @@ QV4::ReturnedValue ConsoleObject::method_profile(CallContext *ctx)
     const QByteArray baSource = frame.source.toUtf8();
     const QByteArray baFunction = frame.function.toUtf8();
     QMessageLogger logger(baSource.constData(), frame.line, baFunction.constData());
-    if (QQmlProfilerService::startProfiling()) {
+    if (!QQmlDebugService::isDebuggingEnabled()) {
+        logger.warning("Cannot start profiling because debug service is disabled. Start with -qmljsdebugger=port:XXXXX.");
+    } else if (QQmlProfilerService::startProfiling()) {
         QV8ProfilerService::instance()->startProfiling(title);
 
         logger.debug("Profiling started.");