diff --git a/share/qtcreator/qml/qmlobserver/crumblepath.cpp b/share/qtcreator/qml/qmlobserver/crumblepath.cpp index f773d37bb47d9919ff8634e2a576f9ac009a24e9..47f471f3c11523d6aef8ce160242fd4cac1d5608 100644 --- 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 index 0000000000000000000000000000000000000000..1c0897973c1a16012f44f814f28405154d7c4018 --- /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 index 0000000000000000000000000000000000000000..1fc371cfec1a632e8ae5a20a19f5412f7c74cb09 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 index 0000000000000000000000000000000000000000..5663d29ee67512937d555536f2dbfe4006ba1652 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 index 0000000000000000000000000000000000000000..741f0575dd7467301e491839628317a648a8b64a 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 index 0000000000000000000000000000000000000000..6ef4e05b45f29c3db82c14b01a8fcb82612b0f93 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 index 0000000000000000000000000000000000000000..c674099b5a18ef978baf32c7e6b9614affb433f6 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 index 0000000000000000000000000000000000000000..ad6e7165f6c1025fbbfe918fd104821b430c7634 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 3fa4752a3f9e9a71827ff377a80d0cacb68c590b..08da6e4cfe9985c76268c43a0bc1d724a1caecb6 100644 --- 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 bb8d6615bb5059f33bfe74346282ebd1bb66f160..623e527d190791fbe0fb4133c7a719b64bc2bac6 100644 --- 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))