diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-12 10:43:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-12 11:34:46 +0200 |
| commit | 5c874322603444ef02bd578ae302c03a9b1cd034 (patch) | |
| tree | 6339db7c3a2683e18208e75895444f2d2d251ebe /src/plugins/coreplugin/locator | |
| parent | 04acb9d643060811dbba8f66d807b2a7574c3a6f (diff) | |
| parent | 8dadafb9e0a2fbb49ab08b9eea0ff307088ba3f8 (diff) | |
| download | qt-creator-5c874322603444ef02bd578ae302c03a9b1cd034.tar.gz | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
Diffstat (limited to 'src/plugins/coreplugin/locator')
| -rw-r--r-- | src/plugins/coreplugin/locator/images/locator.png | bin | 767 -> 0 bytes | |||
| -rw-r--r-- | src/plugins/coreplugin/locator/images/reload.png | bin | 735 -> 0 bytes | |||
| -rw-r--r-- | src/plugins/coreplugin/locator/locator.pri | 3 | ||||
| -rw-r--r-- | src/plugins/coreplugin/locator/locator.qrc | 6 | ||||
| -rw-r--r-- | src/plugins/coreplugin/locator/locatorwidget.cpp | 2 |
5 files changed, 1 insertions, 10 deletions
diff --git a/src/plugins/coreplugin/locator/images/locator.png b/src/plugins/coreplugin/locator/images/locator.png Binary files differdeleted file mode 100644 index 000ee1c018..0000000000 --- a/src/plugins/coreplugin/locator/images/locator.png +++ /dev/null diff --git a/src/plugins/coreplugin/locator/images/reload.png b/src/plugins/coreplugin/locator/images/reload.png Binary files differdeleted file mode 100644 index b5afefb32b..0000000000 --- a/src/plugins/coreplugin/locator/images/reload.png +++ /dev/null diff --git a/src/plugins/coreplugin/locator/locator.pri b/src/plugins/coreplugin/locator/locator.pri index c697437d69..e80765bfc5 100644 --- a/src/plugins/coreplugin/locator/locator.pri +++ b/src/plugins/coreplugin/locator/locator.pri @@ -36,9 +36,6 @@ FORMS += \ $$PWD/directoryfilter.ui \ $$PWD/locatorsettingspage.ui -RESOURCES += \ - $$PWD/locator.qrc - equals(TEST, 1) { HEADERS += $$PWD/locatorfiltertest.h SOURCES += \ diff --git a/src/plugins/coreplugin/locator/locator.qrc b/src/plugins/coreplugin/locator/locator.qrc deleted file mode 100644 index 4cd5df4f13..0000000000 --- a/src/plugins/coreplugin/locator/locator.qrc +++ /dev/null @@ -1,6 +0,0 @@ -<RCC> - <qresource prefix="/locator"> - <file>images/reload.png</file> - <file>images/locator.png</file> - </qresource> -</RCC> diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp index 44917a54a4..1299d1133b 100644 --- a/src/plugins/coreplugin/locator/locatorwidget.cpp +++ b/src/plugins/coreplugin/locator/locatorwidget.cpp @@ -248,7 +248,7 @@ LocatorWidget::LocatorWidget(Locator *qop) : layout->setMargin(0); layout->addWidget(m_fileLineEdit); - setWindowIcon(QIcon(QLatin1String(":/locator/images/locator.png"))); + setWindowIcon(Icons::ZOOM.icon()); const QPixmap pixmap = Icons::MAGNIFIER.pixmap(); m_fileLineEdit->setFiltering(true); m_fileLineEdit->setButtonPixmap(Utils::FancyLineEdit::Left, pixmap); |
