feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Split branded logo from other resources

Browse Source 
We only need the special resource generation for the logo. Keep the
other resources shared with Qbs, so issues like QTCREATORBUG-26969 don't
happen.

Change-Id: Ibe418dffba19e342d0aa5ff30c34409cee184fc0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Eike Ziller
2022-02-02 12:01:05 +01:00
committed by Alessandro Portale
parent 8d12fd07e2
commit ac41f83232
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
if (NOT IS_ABSOLUTE ${IDE_LOGO_PATH}) if (NOT IS_ABSOLUTE ${IDE_LOGO_PATH})
set(IDE_LOGO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${IDE_LOGO_PATH}") set(IDE_LOGO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${IDE_LOGO_PATH}")
endif() endif()
configure_file(core.qrc.cmakein core_cmake.qrc) configure_file(core_logo.qrc.cmakein core_logo_cmake.qrc)
add_qtc_plugin(Core add_qtc_plugin(Core
DEPENDS Qt5::PrintSupport Qt5::Qml Qt5::Sql Qt5::Gui Qt5::GuiPrivate 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 actionmanager/commandsfile.cpp actionmanager/commandsfile.h
basefilewizard.cpp basefilewizard.h basefilewizard.cpp basefilewizard.h
basefilewizardfactory.cpp basefilewizardfactory.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 core_global.h
coreconstants.h coreconstants.h
coreicons.cpp coreicons.h coreicons.cpp coreicons.h

2
src/plugins/coreplugin/core.qrc
View File

@@ -1,7 +1,5 @@
<RCC> <RCC>
<qresource prefix="/core"> <qresource prefix="/core">
<file alias="images/qtcreatorlogo-big.png">images/logo/128/QtProject-qtcreator.png</file>
<file alias="images/qtcreatorlogo-big@2x.png">images/logo/256/QtProject-qtcreator.png</file>
<file>images/settingscategory_core.png</file> <file>images/settingscategory_core.png</file>
<file>images/settingscategory_core@2x.png</file> <file>images/settingscategory_core@2x.png</file>
<file>images/settingscategory_design.png</file> <file>images/settingscategory_design.png</file>

12
src/plugins/coreplugin/core.qrc.cmakein
View File

@@ -1,12 +0,0 @@
<RCC>
<qresource prefix="/core">
<file alias="images/qtcreatorlogo-big.png">${IDE_LOGO_PATH}/images/logo/128/QtProject-qtcreator.png</file>
<file alias="images/qtcreatorlogo-big@2x.png">${IDE_LOGO_PATH}/images/logo/256/QtProject-qtcreator.png</file>
<file alias="images/settingscategory_core.png">${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_core.png</file>
<file alias="images/settingscategory_core@2x.png">${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_core@2x.png</file>
<file alias="images/settingscategory_design.png">${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_design.png</file>
<file alias="images/settingscategory_design@2x.png">${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_design@2x.png</file>
<file alias="images/qtlogo.png">${CMAKE_CURRENT_SOURCE_DIR}/images/qtlogo.png</file>
<file alias="images/qtlogo@2x.png">${CMAKE_CURRENT_SOURCE_DIR}/images/qtlogo@2x.png</file>
</qresource>
</RCC>

6
src/plugins/coreplugin/core_logo.qrc Normal file
View File

@@ -0,0 +1,6 @@
<RCC>
<qresource prefix="/core">
<file alias="images/qtcreatorlogo-big.png">images/logo/128/QtProject-qtcreator.png</file>
<file alias="images/qtcreatorlogo-big@2x.png">images/logo/256/QtProject-qtcreator.png</file>
</qresource>
</RCC>

6
src/plugins/coreplugin/core_logo.qrc.cmakein Normal file
View File

@@ -0,0 +1,6 @@
<RCC>
<qresource prefix="/core">
<file alias="images/qtcreatorlogo-big.png">${IDE_LOGO_PATH}/images/logo/128/QtProject-qtcreator.png</file>
<file alias="images/qtcreatorlogo-big@2x.png">${IDE_LOGO_PATH}/images/logo/256/QtProject-qtcreator.png</file>
</qresource>
</RCC>

1
src/plugins/coreplugin/coreplugin.qbs
View File

@@ -37,6 +37,7 @@ Project {
"basefilewizardfactory.h", "basefilewizardfactory.h",
"core.qrc", "core.qrc",
"core_global.h", "core_global.h",
"core_logo.qrc",
"coreconstants.h", "coreconstants.h",
"coreicons.cpp", "coreicons.cpp",
"coreicons.h", "coreicons.h",