QmlObserver: Fix QPainter warnings

The specified images in the resources weren't part of the qmlobserver,
and therefore 'tinting' then resulted in QPainter errors.

Task-number: QTCREATORBUG-2562
Reviewed-by: Lasse Holmstedt

diff --git a/share/qtcreator/qml/qmlobserver/crumblepath.cpp b/share/qtcreator/qml/qmlobserver/crumblepath.cpp
index f773d37..47f471f 100644 (file)
--- a/share/qtcreator/qml/qmlobserver/crumblepath.cpp
+++ b/share/qtcreator/qml/qmlobserver/crumblepath.cpp
@@ -150,12 +150,12 @@ CrumblePathButton::CrumblePathButton(const QString &title, QWidget *parent)
     m_textPos.setY(height());
     m_baseColor = QColor(0x666666);
 
-    m_segment = QImage(":/utils/images/crumblepath-segment.png");
-    m_segmentSelected = QImage(":/utils/images/crumblepath-segment-selected.png");
-    m_segmentHover = QImage(":/utils/images/crumblepath-segment-hover.png");
-    m_segmentEnd = QImage(":/utils/images/crumblepath-segment-end.png");
-    m_segmentSelectedEnd = QImage(":/utils/images/crumblepath-segment-selected-end.png");
-    m_segmentHoverEnd = QImage(":/utils/images/crumblepath-segment-hover-end.png");
+    m_segment = QImage(":/crumblepath/images/crumblepath-segment.png");
+    m_segmentSelected = QImage(":/crumblepath/images/crumblepath-segment-selected.png");
+    m_segmentHover = QImage(":/crumblepath/images/crumblepath-segment-hover.png");
+    m_segmentEnd = QImage(":/crumblepath/images/crumblepath-segment-end.png");
+    m_segmentSelectedEnd = QImage(":/crumblepath/images/crumblepath-segment-selected-end.png");
+    m_segmentHoverEnd = QImage(":/crumblepath/images/crumblepath-segment-hover-end.png");
 
     tintImages();
 }

diff --git a/share/qtcreator/qml/qmlobserver/crumblepath.qrc b/share/qtcreator/qml/qmlobserver/crumblepath.qrc
new file mode 100644 (file)
index 0000000..1c08979
--- /dev/null
+++ b/share/qtcreator/qml/qmlobserver/crumblepath.qrc
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/crumblepath">
+        <file>images/crumblepath-segment-end.png</file>
+        <file>images/crumblepath-segment-hover-end.png</file>
+        <file>images/crumblepath-segment-hover.png</file>
+        <file>images/crumblepath-segment-selected-end.png</file>
+        <file>images/crumblepath-segment-selected.png</file>
+        <file>images/crumblepath-segment.png</file>
+    </qresource>
+</RCC>

diff --git a/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-end.png b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-end.png
new file mode 100644 (file)
index 0000000..1fc371c
Binary files /dev/null and b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-end.png differ

diff --git a/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-hover-end.png b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-hover-end.png
new file mode 100644 (file)
index 0000000..5663d29
Binary files /dev/null and b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-hover-end.png differ

diff --git a/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-hover.png b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-hover.png
new file mode 100644 (file)
index 0000000..741f057
Binary files /dev/null and b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-hover.png differ

diff --git a/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-selected-end.png b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-selected-end.png
new file mode 100644 (file)
index 0000000..6ef4e05
Binary files /dev/null and b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-selected-end.png differ

diff --git a/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-selected.png b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-selected.png
new file mode 100644 (file)
index 0000000..c674099
Binary files /dev/null and b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-selected.png differ

diff --git a/share/qtcreator/qml/qmlobserver/images/crumblepath-segment.png b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment.png
new file mode 100644 (file)
index 0000000..ad6e716
Binary files /dev/null and b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment.png differ

diff --git a/share/qtcreator/qml/qmlobserver/qml.pri b/share/qtcreator/qml/qmlobserver/qml.pri
index 3fa4752..08da6e4 100644 (file)
--- a/share/qtcreator/qml/qmlobserver/qml.pri
+++ b/share/qtcreator/qml/qmlobserver/qml.pri
@@ -25,7 +25,8 @@ SOURCES += $$PWD/qmlruntime.cpp \
            $$PWD/loggerwidget.cpp \
            $$PWD/crumblepath.cpp
 
-RESOURCES += $$PWD/qmlruntime.qrc
+RESOURCES += $$PWD/qmlruntime.qrc \
+    crumblepath.qrc
 
 OTHER_FILES += toolbarstyle.css
 

diff --git a/src/plugins/qt4projectmanager/qmlobservertool.cpp b/src/plugins/qt4projectmanager/qmlobservertool.cpp
index bb8d661..623e527 100644 (file)
--- a/src/plugins/qt4projectmanager/qmlobservertool.cpp
+++ b/src/plugins/qt4projectmanager/qmlobservertool.cpp
@@ -140,7 +140,11 @@ QString QmlObserverTool::copy(const QString &qtInstallData, QString *errorMessag
           << QLatin1String("content/Browser.qml") << QLatin1String("content/images/folder.png")
           << QLatin1String("content/images/titlebar.png") << QLatin1String("content/images/titlebar.sci")
           << QLatin1String("content/images/up.png")
-          << QLatin1String("LICENSE.LGPL") << QLatin1String("LGPL_EXCEPTION.TXT");
+          << QLatin1String("LICENSE.LGPL") << QLatin1String("LGPL_EXCEPTION.TXT")
+          << QLatin1String("crumblepath.qrc") << QLatin1String("images/crumblepath-segment-end.png")
+          << QLatin1String("images/crumblepath-segment-hover-end.png") << QLatin1String("images/crumblepath-segment-hover.png")
+          << QLatin1String("images/crumblepath-segment-selected-end.png") << QLatin1String("images/crumblepath-segment-selected.png")
+          << QLatin1String("images/crumblepath-segment.png");
 
     QStringList debuggerLibFiles;
     debuggerLibFiles << QLatin1String("jsdebuggeragent.cpp")
@@ -188,6 +192,7 @@ QString QmlObserverTool::copy(const QString &qtInstallData, QString *errorMessag
     // Try to find a writeable directory.
     foreach(const QString &directory, directories) {
         if (!mkpath(directory + QLatin1String("/content/images"), errorMessage)
+            || !mkpath(directory + QLatin1String("/images"), errorMessage)
             || !mkpath(directory + QLatin1String("/qmljsdebugger/editor/images"), errorMessage)
             || !mkpath(directory + QLatin1String("/qmljsdebugger/include"), errorMessage)
             || !mkpath(directory + QLatin1String("/qmljsdebugger/include/qt_private"), errorMessage))