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/qmldesigner/qmldesignericons.h | |
| parent | 04acb9d643060811dbba8f66d807b2a7574c3a6f (diff) | |
| parent | 8dadafb9e0a2fbb49ab08b9eea0ff307088ba3f8 (diff) | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
Diffstat (limited to 'src/plugins/qmldesigner/qmldesignericons.h')
| -rw-r--r-- | src/plugins/qmldesigner/qmldesignericons.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/qmldesignericons.h b/src/plugins/qmldesigner/qmldesignericons.h index ab10dda7e3..922e385f55 100644 --- a/src/plugins/qmldesigner/qmldesignericons.h +++ b/src/plugins/qmldesigner/qmldesignericons.h @@ -46,8 +46,6 @@ const Utils::Icon EXPORT_CHECKED({ {QLatin1String(":/navigator/icon/export_checked.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EXPORT_UNCHECKED({ {QLatin1String(":/navigator/icon/export_unchecked.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon BOUNDING_RECT({ - {QLatin1String(":/icon/layout/boundingrect.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon SNAPPING({ {QLatin1String(":/icon/layout/snapping.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon NO_SNAPPING({ |