diff --git a/src/plugins/coreplugin/CMakeLists.txt b/src/plugins/coreplugin/CMakeLists.txt index a68132707f5..d73fafd14e5 100644 --- a/src/plugins/coreplugin/CMakeLists.txt +++ b/src/plugins/coreplugin/CMakeLists.txt @@ -1,7 +1,7 @@ if (NOT IS_ABSOLUTE ${IDE_LOGO_PATH}) set(IDE_LOGO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${IDE_LOGO_PATH}") endif() -configure_file(core.qrc.cmakein core_cmake.qrc) +configure_file(core_logo.qrc.cmakein core_logo_cmake.qrc) add_qtc_plugin(Core DEPENDS Qt5::PrintSupport Qt5::Qml Qt5::Sql Qt5::Gui Qt5::GuiPrivate @@ -15,7 +15,8 @@ add_qtc_plugin(Core actionmanager/commandsfile.cpp actionmanager/commandsfile.h basefilewizard.cpp basefilewizard.h basefilewizardfactory.cpp basefilewizardfactory.h - ${CMAKE_CURRENT_BINARY_DIR}/core_cmake.qrc + ${CMAKE_CURRENT_BINARY_DIR}/core_logo_cmake.qrc + core.qrc core_global.h coreconstants.h coreicons.cpp coreicons.h diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 4389dba12b3..ff855e3f4b8 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -1,7 +1,5 @@ - images/logo/128/QtProject-qtcreator.png - images/logo/256/QtProject-qtcreator.png images/settingscategory_core.png images/settingscategory_core@2x.png images/settingscategory_design.png diff --git a/src/plugins/coreplugin/core.qrc.cmakein b/src/plugins/coreplugin/core.qrc.cmakein deleted file mode 100644 index dae636db832..00000000000 --- a/src/plugins/coreplugin/core.qrc.cmakein +++ /dev/null @@ -1,12 +0,0 @@ - - - ${IDE_LOGO_PATH}/images/logo/128/QtProject-qtcreator.png - ${IDE_LOGO_PATH}/images/logo/256/QtProject-qtcreator.png - ${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_core.png - ${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_core@2x.png - ${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_design.png - ${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_design@2x.png - ${CMAKE_CURRENT_SOURCE_DIR}/images/qtlogo.png - ${CMAKE_CURRENT_SOURCE_DIR}/images/qtlogo@2x.png - - diff --git a/src/plugins/coreplugin/core_logo.qrc b/src/plugins/coreplugin/core_logo.qrc new file mode 100644 index 00000000000..4e9d9c87576 --- /dev/null +++ b/src/plugins/coreplugin/core_logo.qrc @@ -0,0 +1,6 @@ + + + images/logo/128/QtProject-qtcreator.png + images/logo/256/QtProject-qtcreator.png + + diff --git a/src/plugins/coreplugin/core_logo.qrc.cmakein b/src/plugins/coreplugin/core_logo.qrc.cmakein new file mode 100644 index 00000000000..f595e107031 --- /dev/null +++ b/src/plugins/coreplugin/core_logo.qrc.cmakein @@ -0,0 +1,6 @@ + + + ${IDE_LOGO_PATH}/images/logo/128/QtProject-qtcreator.png + ${IDE_LOGO_PATH}/images/logo/256/QtProject-qtcreator.png + + diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index 3af3e92f9d1..eee6b60018e 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -37,6 +37,7 @@ Project { "basefilewizardfactory.h", "core.qrc", "core_global.h", + "core_logo.qrc", "coreconstants.h", "coreicons.cpp", "coreicons.h",