diff --git a/src/app/puzzle/main.cpp b/src/app/puzzle/main.cpp index 9da485e01..defa4ce78 100644 --- a/src/app/puzzle/main.cpp +++ b/src/app/puzzle/main.cpp @@ -63,10 +63,9 @@ auto main(int argc, char *argv[]) -> int #if defined(Q_OS_MACX) Q_INIT_RESOURCE(mac_light_theme); // NOLINT Q_INIT_RESOURCE(mac_dark_theme); // NOLINT -#else +#endif Q_INIT_RESOURCE(win_light_theme); // NOLINT Q_INIT_RESOURCE(win_dark_theme); // NOLINT -#endif #if defined(Q_OS_WIN) VAbstractApplication::WinAttachConsole(); diff --git a/src/app/tape/main.cpp b/src/app/tape/main.cpp index e737bdd04..de1e2a8b2 100644 --- a/src/app/tape/main.cpp +++ b/src/app/tape/main.cpp @@ -61,10 +61,9 @@ auto main(int argc, char *argv[]) -> int #if defined(Q_OS_MACX) Q_INIT_RESOURCE(mac_light_theme); // NOLINT Q_INIT_RESOURCE(mac_dark_theme); // NOLINT -#else +#endif Q_INIT_RESOURCE(win_light_theme); // NOLINT Q_INIT_RESOURCE(win_dark_theme); // NOLINT -#endif #if defined(Q_OS_WIN) VAbstractApplication::WinAttachConsole(); diff --git a/src/app/valentina/main.cpp b/src/app/valentina/main.cpp index 7052b4278..2a1918d81 100644 --- a/src/app/valentina/main.cpp +++ b/src/app/valentina/main.cpp @@ -69,10 +69,9 @@ auto main(int argc, char *argv[]) -> int #if defined(Q_OS_MACX) Q_INIT_RESOURCE(mac_light_theme); // NOLINT Q_INIT_RESOURCE(mac_dark_theme); // NOLINT -#else +#endif Q_INIT_RESOURCE(win_light_theme); // NOLINT Q_INIT_RESOURCE(win_dark_theme); // NOLINT -#endif #if defined(Q_OS_WIN) VAbstractApplication::WinAttachConsole(); diff --git a/src/libs/vmisc/theme/vtheme.cpp b/src/libs/vmisc/theme/vtheme.cpp index acc1b0c5f..f5a9ab1c8 100644 --- a/src/libs/vmisc/theme/vtheme.cpp +++ b/src/libs/vmisc/theme/vtheme.cpp @@ -597,7 +597,9 @@ void VTheme::ResetThemeSettings() const //--------------------------------------------------------------------------------------------------------------------- auto VTheme::GetFallbackThemeIcon(const QString &iconName, QSize iconSize) -> QIcon { - QString filePath = QStringLiteral(":icons/%1/%2.svg").arg(DefaultThemeName(), iconName); + const QString themePrefix = (ColorSheme() == VColorSheme::Light ? QStringLiteral("Light") : QStringLiteral("Dark")); + const QString themeName = QStringLiteral("Eleven-%1").arg(themePrefix); + const QString filePath = QStringLiteral(":icons/%1/%2.svg").arg(themeName, iconName); QIcon icon; icon.addFile(filePath, iconSize, QIcon::Normal, QIcon::On); diff --git a/src/libs/vmisc/vmisc.qbs b/src/libs/vmisc/vmisc.qbs index be41c89ce..bcc0f84a5 100644 --- a/src/libs/vmisc/vmisc.qbs +++ b/src/libs/vmisc/vmisc.qbs @@ -205,7 +205,6 @@ VLib { "win_light_theme.qrc", "win_dark_theme.qrc" ] - condition: !qbs.targetOS.contains("macos") } Group {