forked from qt-creator/qt-creator
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
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
10
share/qtcreator/qml/qmlobserver/crumblepath.qrc
Normal file
10
share/qtcreator/qml/qmlobserver/crumblepath.qrc
Normal file
@@ -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>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
BIN
share/qtcreator/qml/qmlobserver/images/crumblepath-segment.png
Normal file
BIN
share/qtcreator/qml/qmlobserver/images/crumblepath-segment.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
@@ -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
|
||||
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user