Apply clang-format and cmake-format
This commit is contained in:
parent
41a1ede6fc
commit
8642f14bb1
|
@ -512,8 +512,9 @@ if (REQUIRED_ICONS)
|
||||||
list(APPEND RES_FILES "${BUILTIN_ICON_THEMES_QRC_FILE}")
|
list(APPEND RES_FILES "${BUILTIN_ICON_THEMES_QRC_FILE}")
|
||||||
|
|
||||||
if (EXISTS "${BUILTIN_ICON_THEMES_QRC_FILE}")
|
if (EXISTS "${BUILTIN_ICON_THEMES_QRC_FILE}")
|
||||||
message(STATUS "Using existing \"${BUILTIN_ICON_THEMES_QRC_FILE}\" to bundle icon themes for ${META_PROJECT_NAME}. "
|
message(
|
||||||
"Remove this file to force re-generation of the resource file.")
|
STATUS "Using existing \"${BUILTIN_ICON_THEMES_QRC_FILE}\" to bundle icon themes for ${META_PROJECT_NAME}. "
|
||||||
|
"Remove this file to force re-generation of the resource file.")
|
||||||
else ()
|
else ()
|
||||||
set(ICON_THEME_FILES)
|
set(ICON_THEME_FILES)
|
||||||
set(ICON_SEARCH_PATHS ${BUILTIN_ICON_THEMES_SEARCH_PATH})
|
set(ICON_SEARCH_PATHS ${BUILTIN_ICON_THEMES_SEARCH_PATH})
|
||||||
|
@ -524,8 +525,8 @@ if (REQUIRED_ICONS)
|
||||||
endforeach ()
|
endforeach ()
|
||||||
endif ()
|
endif ()
|
||||||
list(APPEND ICON_SEARCH_PATHS "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons")
|
list(APPEND ICON_SEARCH_PATHS "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons")
|
||||||
list(APPEND ICON_SEARCH_PATHS "/usr/${CMAKE_INSTALL_DATAROOTDIR}/icons") # find icons from regular prefix when cross-
|
list(APPEND ICON_SEARCH_PATHS "/usr/${CMAKE_INSTALL_DATAROOTDIR}/icons") # find icons from regular prefix when
|
||||||
# compiling
|
# cross- compiling
|
||||||
list(REMOVE_DUPLICATES ICON_SEARCH_PATHS)
|
list(REMOVE_DUPLICATES ICON_SEARCH_PATHS)
|
||||||
set(BUILTIN_ICONS_DIR "${CMAKE_CURRENT_BINARY_DIR}/icons")
|
set(BUILTIN_ICONS_DIR "${CMAKE_CURRENT_BINARY_DIR}/icons")
|
||||||
set(DEFAULT_THEME_INDEX_FILE "${BUILTIN_ICONS_DIR}/default/index.theme")
|
set(DEFAULT_THEME_INDEX_FILE "${BUILTIN_ICONS_DIR}/default/index.theme")
|
||||||
|
@ -562,8 +563,8 @@ if (REQUIRED_ICONS)
|
||||||
LIST_DIRECTORIES false
|
LIST_DIRECTORIES false
|
||||||
"${ICON_THEME_PATH}/index.theme")
|
"${ICON_THEME_PATH}/index.theme")
|
||||||
endif ()
|
endif ()
|
||||||
# make the first non-dark specified built-in theme the "default" theme
|
# make the first non-dark specified built-in theme the "default" theme make the first dark specified
|
||||||
# make the first dark specified built-in theme the "default-dark" theme
|
# built-in theme the "default-dark" theme
|
||||||
if (NEW_ICON_THEME_NAME MATCHES ".*-dark" AND NOT EXISTS "${DEFAULT_DARK_THEME_INDEX_FILE}")
|
if (NEW_ICON_THEME_NAME MATCHES ".*-dark" AND NOT EXISTS "${DEFAULT_DARK_THEME_INDEX_FILE}")
|
||||||
file(MAKE_DIRECTORY "${BUILTIN_ICONS_DIR}/default-dark")
|
file(MAKE_DIRECTORY "${BUILTIN_ICONS_DIR}/default-dark")
|
||||||
file(WRITE "${DEFAULT_DARK_THEME_INDEX_FILE}" "[Icon Theme]\nInherits=${NEW_ICON_THEME_NAME}")
|
file(WRITE "${DEFAULT_DARK_THEME_INDEX_FILE}" "[Icon Theme]\nInherits=${NEW_ICON_THEME_NAME}")
|
||||||
|
@ -604,21 +605,22 @@ if (REQUIRED_ICONS)
|
||||||
if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
|
if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
|
||||||
if (CMAKE_VERSION VERSION_LESS "3.14")
|
if (CMAKE_VERSION VERSION_LESS "3.14")
|
||||||
message(FATAL_ERROR "Need at least CMake 3.14 on Windows to read symlinks of"
|
message(FATAL_ERROR "Need at least CMake 3.14 on Windows to read symlinks of"
|
||||||
"icon theme to be bundled.")
|
"icon theme to be bundled.")
|
||||||
endif ()
|
endif ()
|
||||||
while (IS_SYMLINK "${ICON_THEME_FILE}")
|
while (IS_SYMLINK "${ICON_THEME_FILE}")
|
||||||
get_filename_component(ICON_THEME_FILE_DIR "${ICON_THEME_FILE}" DIRECTORY)
|
get_filename_component(ICON_THEME_FILE_DIR "${ICON_THEME_FILE}" DIRECTORY)
|
||||||
file(READ_SYMLINK "${ICON_THEME_FILE}" ICON_THEME_FILE)
|
file(READ_SYMLINK "${ICON_THEME_FILE}" ICON_THEME_FILE)
|
||||||
if(NOT IS_ABSOLUTE "${ICON_THEME_FILE}")
|
if (NOT IS_ABSOLUTE "${ICON_THEME_FILE}")
|
||||||
set(ICON_THEME_FILE "${ICON_THEME_FILE_DIR}/${ICON_THEME_FILE}")
|
set(ICON_THEME_FILE "${ICON_THEME_FILE_DIR}/${ICON_THEME_FILE}")
|
||||||
endif()
|
endif ()
|
||||||
endwhile ()
|
endwhile ()
|
||||||
endif ()
|
endif ()
|
||||||
get_filename_component(ICON_THEME_FILE "${ICON_THEME_FILE}" REALPATH)
|
get_filename_component(ICON_THEME_FILE "${ICON_THEME_FILE}" REALPATH)
|
||||||
else ()
|
else ()
|
||||||
unset(ICON_THEME_FILE_ALIAS)
|
unset(ICON_THEME_FILE_ALIAS)
|
||||||
endif ()
|
endif ()
|
||||||
string(REGEX REPLACE "^${ICON_SEARCH_PATH}/" "" ICON_THEME_FILE_RELATIVE_PATH "${ICON_THEME_FILE}")
|
string(REGEX REPLACE "^${ICON_SEARCH_PATH}/" "" ICON_THEME_FILE_RELATIVE_PATH
|
||||||
|
"${ICON_THEME_FILE}")
|
||||||
string(REGEX REPLACE "(^[^/\\]+)" "${NEW_ICON_THEME_NAME}" NEW_ICON_THEME_FILE_RELATIVE_PATH
|
string(REGEX REPLACE "(^[^/\\]+)" "${NEW_ICON_THEME_NAME}" NEW_ICON_THEME_FILE_RELATIVE_PATH
|
||||||
"${ICON_THEME_FILE_RELATIVE_PATH}")
|
"${ICON_THEME_FILE_RELATIVE_PATH}")
|
||||||
get_filename_component(ICON_THEME_FILE_DIR "${ICON_THEME_FILE_RELATIVE_PATH}" DIRECTORY)
|
get_filename_component(ICON_THEME_FILE_DIR "${ICON_THEME_FILE_RELATIVE_PATH}" DIRECTORY)
|
||||||
|
|
|
@ -319,8 +319,7 @@ void setupCommonQtApplicationAttributes()
|
||||||
// and https://www.qt.io/blog/dark-mode-on-windows-11-with-qt-6.5
|
// and https://www.qt.io/blog/dark-mode-on-windows-11-with-qt-6.5
|
||||||
#if defined(Q_OS_WINDOWS) && (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) && (QT_VERSION < QT_VERSION_CHECK(6, 5, 0))
|
#if defined(Q_OS_WINDOWS) && (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) && (QT_VERSION < QT_VERSION_CHECK(6, 5, 0))
|
||||||
if (const auto qtVersion = QLibraryInfo::version();
|
if (const auto qtVersion = QLibraryInfo::version();
|
||||||
qtVersion >= QVersionNumber(6, 4, 0) && qtVersion < QVersionNumber(6, 5, 0)
|
qtVersion >= QVersionNumber(6, 4, 0) && qtVersion < QVersionNumber(6, 5, 0) && !qEnvironmentVariableIsSet("QT_QPA_PLATFORM")) {
|
||||||
&& !qEnvironmentVariableIsSet("QT_QPA_PLATFORM")) {
|
|
||||||
qputenv("QT_QPA_PLATFORM", "windows:darkmode=1");
|
qputenv("QT_QPA_PLATFORM", "windows:darkmode=1");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -265,7 +265,7 @@ void QtSettings::reevaluatePaletteAndDefaultIconTheme()
|
||||||
{
|
{
|
||||||
const auto isPaletteDark = QtUtilities::isPaletteDark();
|
const auto isPaletteDark = QtUtilities::isPaletteDark();
|
||||||
if (isPaletteDark == m_d->isPaletteDark) {
|
if (isPaletteDark == m_d->isPaletteDark) {
|
||||||
return; // no need to do anything if there's no change
|
return; // no need to do anything if there's no change
|
||||||
}
|
}
|
||||||
m_d->isPaletteDark = isPaletteDark;
|
m_d->isPaletteDark = isPaletteDark;
|
||||||
if (auto iconTheme = QIcon::themeName(); iconTheme == QStringLiteral("default") || iconTheme == QStringLiteral("default-dark")) {
|
if (auto iconTheme = QIcon::themeName(); iconTheme == QStringLiteral("default") || iconTheme == QStringLiteral("default-dark")) {
|
||||||
|
|
Loading…
Reference in New Issue