diff --git a/share/qtcreator/templates/wizards/projects/nimble/icon.png b/share/qtcreator/templates/wizards/projects/nimble/icon.png deleted file mode 100644 index d3f8575b26b..00000000000 Binary files a/share/qtcreator/templates/wizards/projects/nimble/icon.png and /dev/null differ diff --git a/share/qtcreator/templates/wizards/projects/nimble/icon@2x.png b/share/qtcreator/templates/wizards/projects/nimble/icon@2x.png deleted file mode 100644 index bdc8c57055f..00000000000 Binary files a/share/qtcreator/templates/wizards/projects/nimble/icon@2x.png and /dev/null differ diff --git a/share/qtcreator/templates/wizards/projects/nimble/wizard.json b/share/qtcreator/templates/wizards/projects/nimble/wizard.json index bef6ee34eac..4f3ac9d8ea2 100644 --- a/share/qtcreator/templates/wizards/projects/nimble/wizard.json +++ b/share/qtcreator/templates/wizards/projects/nimble/wizard.json @@ -9,7 +9,7 @@ "featuresRequired":[ "ToolChain.Nim.NimToolChain" ], - "icon":"icon.png", + "icon":"../nim/icon.png", "enabled":"%{JS: value('Plugins').indexOf('Nim') >= 0 }", "options":[ { diff --git a/src/plugins/genericprojectmanager/CMakeLists.txt b/src/plugins/genericprojectmanager/CMakeLists.txt index 282b86d0295..13ed2d53737 100644 --- a/src/plugins/genericprojectmanager/CMakeLists.txt +++ b/src/plugins/genericprojectmanager/CMakeLists.txt @@ -12,7 +12,6 @@ add_qtc_plugin(GenericProjectManager genericproject.cpp genericproject.h genericprojectconstants.h genericprojectfileseditor.cpp genericprojectfileseditor.h - genericprojectmanager.qrc genericprojectplugin.cpp genericprojectplugin.h genericprojectwizard.cpp genericprojectwizard.h ) diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.pro b/src/plugins/genericprojectmanager/genericprojectmanager.pro index e1e2022a393..a8d7b35aba5 100644 --- a/src/plugins/genericprojectmanager/genericprojectmanager.pro +++ b/src/plugins/genericprojectmanager/genericprojectmanager.pro @@ -16,5 +16,3 @@ SOURCES = genericproject.cpp \ genericmakestep.cpp \ genericbuildconfiguration.cpp \ filesselectionwizardpage.cpp - -RESOURCES += genericprojectmanager.qrc diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qrc b/src/plugins/genericprojectmanager/genericprojectmanager.qrc deleted file mode 100644 index 295b5477083..00000000000 --- a/src/plugins/genericprojectmanager/genericprojectmanager.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - images/genericprojectmanager.png - images/genericprojectmanager@2x.png - - diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp index 56d02a1aac3..b6d1ac1036e 100644 --- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp +++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -112,7 +113,7 @@ QString GenericProjectWizardDialog::projectName() const GenericProjectWizard::GenericProjectWizard() { setSupportedProjectTypes({Constants::GENERICPROJECT_ID}); - setIcon(QIcon(QLatin1String(":/genericprojectmanager/images/genericprojectmanager.png"))); + setIcon(ProjectExplorer::Icons::WIZARD_IMPORT_AS_PROJECT.icon()); setDisplayName(tr("Import Existing Project")); setId("Z.Makefile"); setDescription(tr("Imports existing projects that do not use qmake, CMake or Autotools. " diff --git a/src/plugins/genericprojectmanager/images/genericprojectmanager.png b/src/plugins/genericprojectmanager/images/genericprojectmanager.png deleted file mode 100644 index b75e0422f7f..00000000000 Binary files a/src/plugins/genericprojectmanager/images/genericprojectmanager.png and /dev/null differ diff --git a/src/plugins/genericprojectmanager/images/genericprojectmanager@2x.png b/src/plugins/genericprojectmanager/images/genericprojectmanager@2x.png deleted file mode 100644 index 8c708b52e3b..00000000000 Binary files a/src/plugins/genericprojectmanager/images/genericprojectmanager@2x.png and /dev/null differ diff --git a/src/plugins/projectexplorer/projectexplorericons.cpp b/src/plugins/projectexplorer/projectexplorericons.cpp index 883739dca01..dbc92be002a 100644 --- a/src/plugins/projectexplorer/projectexplorericons.cpp +++ b/src/plugins/projectexplorer/projectexplorericons.cpp @@ -64,6 +64,8 @@ const Icon DEVICE_DISCONNECTED_INDICATOR({ {":/utils/images/filledcircle.png", Theme::IconsStopColor}}, Icon::Tint); const Icon DEVICE_DISCONNECTED_INDICATOR_OVERLAY({ {":/projectexplorer/images/devicestatusindicator.png", Theme::IconsStopToolBarColor}}); +const Icon WIZARD_IMPORT_AS_PROJECT( + ":/projectexplorer/images/importasproject.png"); const Icon DEBUG_START_FLAT({ {":/projectexplorer/images/run_mask.png", Theme::IconsRunToolBarColor}, diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h index 9776e74c0ff..56969e962d2 100644 --- a/src/plugins/projectexplorer/projectexplorericons.h +++ b/src/plugins/projectexplorer/projectexplorericons.h @@ -47,6 +47,7 @@ PROJECTEXPLORER_EXPORT extern const Utils::Icon DEVICE_CONNECTED_INDICATOR; PROJECTEXPLORER_EXPORT extern const Utils::Icon DEVICE_CONNECTED_INDICATOR_OVERLAY; PROJECTEXPLORER_EXPORT extern const Utils::Icon DEVICE_DISCONNECTED_INDICATOR; PROJECTEXPLORER_EXPORT extern const Utils::Icon DEVICE_DISCONNECTED_INDICATOR_OVERLAY; +PROJECTEXPLORER_EXPORT extern const Utils::Icon WIZARD_IMPORT_AS_PROJECT; PROJECTEXPLORER_EXPORT extern const Utils::Icon DEBUG_START_FLAT; PROJECTEXPLORER_EXPORT extern const Utils::Icon DEBUG_START_SMALL; diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs index e46f7c90b45..bb4a318e789 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs @@ -84,12 +84,7 @@ Project { Group { name: "Wizard Images" prefix: "wizards/images/" - files: [ - "console.png", - "gui.png", - "lib.png", - "qtquickapp.png", - ] + files: ["*.png"] } Export { diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h index c3a2721ef12..41591fab593 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h @@ -66,9 +66,6 @@ const char QMAKE_BC_ID[] = "Qt4ProjectManager.Qt4BuildConfiguration"; const char MAKESTEP_BS_ID[] = "Qt4ProjectManager.MakeStep"; const char QMAKE_BS_ID[] = "QtProjectManager.QMakeBuildStep"; -// ICONS -const char ICON_QTQUICK_APP[] = ":/wizards/images/qtquickapp.png"; - // Kit const char KIT_INFORMATION_ID[] = "QtPM4.mkSpecInformation"; diff --git a/src/plugins/qmakeprojectmanager/wizards/images/console.png b/src/plugins/qmakeprojectmanager/wizards/images/console.png deleted file mode 100644 index 36c822d9dc1..00000000000 Binary files a/src/plugins/qmakeprojectmanager/wizards/images/console.png and /dev/null differ diff --git a/src/plugins/qmakeprojectmanager/wizards/images/console@2x.png b/src/plugins/qmakeprojectmanager/wizards/images/console@2x.png deleted file mode 100644 index d94451c152b..00000000000 Binary files a/src/plugins/qmakeprojectmanager/wizards/images/console@2x.png and /dev/null differ diff --git a/src/plugins/qmakeprojectmanager/wizards/images/lib.png b/src/plugins/qmakeprojectmanager/wizards/images/lib.png deleted file mode 100644 index 52cb73e382e..00000000000 Binary files a/src/plugins/qmakeprojectmanager/wizards/images/lib.png and /dev/null differ diff --git a/src/plugins/qmakeprojectmanager/wizards/images/lib@2x.png b/src/plugins/qmakeprojectmanager/wizards/images/lib@2x.png deleted file mode 100644 index c959779b029..00000000000 Binary files a/src/plugins/qmakeprojectmanager/wizards/images/lib@2x.png and /dev/null differ diff --git a/src/plugins/qmakeprojectmanager/wizards/images/qtquickapp.png b/src/plugins/qmakeprojectmanager/wizards/images/qtquickapp.png deleted file mode 100644 index 23c02368718..00000000000 Binary files a/src/plugins/qmakeprojectmanager/wizards/images/qtquickapp.png and /dev/null differ diff --git a/src/plugins/qmakeprojectmanager/wizards/wizards.qrc b/src/plugins/qmakeprojectmanager/wizards/wizards.qrc index 89c496bc7ee..a183a3bbc6d 100644 --- a/src/plugins/qmakeprojectmanager/wizards/wizards.qrc +++ b/src/plugins/qmakeprojectmanager/wizards/wizards.qrc @@ -1,11 +1,6 @@ - images/console.png - images/console@2x.png images/gui.png images/gui@2x.png - images/lib.png - images/lib@2x.png - images/qtquickapp.png diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 182c104e2f1..93915b03bcd 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -1828,7 +1828,7 @@ style="fill:#6b7080;fill-opacity:1" /> + id="share/qtcreator/templates/wizards/global/lib"> + id="share/qtcreator/templates/wizards/projects/qtquick2-extension/lib"> - - @@ -2730,7 +2714,7 @@ x="0" /> + id="share/qtcreator/templates/wizards/projects/qtforpythonapplication/icons/icon"> - - - - - @@ -5471,7 +5425,7 @@ sodipodi:nodetypes="cc" /> + id="src/plugins/boot2qt/images/qdbdevice"> - - - - - - - - - - - - - - - - - - - - - - - -