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

Change-Id: Id27c36e55fcc68cc1140b0d9bec00b8ae6b52ed0

2 files changed, 10 insertions, 2 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index c2718de240..90d2a940a3 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -238,7 +238,7 @@ void LoadWatcher::checkForWindow(QObject *o)
     }
 #else
     Q_UNUSED(o)
-#endif // QT_GUI_LIB
+#endif // QT_GUI_LIB && !QT_NO_OPENGL
 }
 
 #if defined(QT_GUI_LIB) && !defined(QT_NO_OPENGL)
@@ -257,7 +257,7 @@ void LoadWatcher::onOpenGlContextCreated(QOpenGLContext *context)
     puts(output.constData());
     context->doneCurrent();
 }
-#endif // QT_GUI_LIB
+#endif // QT_GUI_LIB && !QT_NO_OPENGL
 
 void quietMessageHandler(QtMsgType type, const QMessageLogContext &ctxt, const QString &msg)
 {
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index c7539ac874..911328c12a 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -461,6 +461,12 @@ public:
     void dumpComposite(QQmlEngine *engine, const QQmlType *compositeType, QSet<QByteArray> &defaultReachableNames)
     {
         QQmlComponent e(engine, compositeType->sourceUrl());
+        if (!e.isReady()) {
+            std::cerr << "WARNING: skipping module " << compositeType->elementName().toStdString()
+                      << std::endl << e.errorString().toStdString() << std::endl;
+            return;
+        }
+
         QObject *object = e.create();
 
         if (!object)
@@ -901,6 +907,7 @@ void printDebugMessage(QtMsgType, const QMessageLogContext &, const QString &msg
     // In case of QtFatalMsg the calling code will abort() when appropriate.
 }
 
+
 int main(int argc, char *argv[])
 {
 #if defined(Q_OS_WIN) && !defined(Q_CC_MINGW)
@@ -1041,6 +1048,7 @@ int main(int argc, char *argv[])
     if (calculateDependencies)
         getDependencies(engine, pluginImportUri, pluginImportVersion, &dependencies);
     compactDependencies(&dependencies);
+
     // load the QtQml 2.2 builtins and the dependencies
     {
         QByteArray code("import QtQml 2.2");