From: Manuel Nickschas Date: Wed, 15 Aug 2018 23:35:09 +0000 (+0200) Subject: cmake: Autogenerate most of the .qrc resource files X-Git-Tag: test-travis-01~164 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=1a45f16a9734820fba42fe1db3f38dd1eee49df6 cmake: Autogenerate most of the .qrc resource files With the CMake support from the previous commit, resource files can now be autogenerated. Do this for almost all resources; the hicolor one is special because it uses aliases, and the i18n one requires more work that is going to be added in a follow-up commit. Combine several of the previous resources (e.g. different icon sets) to reduce complexity. This wasn't possible previously due to the various configuration-specific combinations, but can now be done dynamically by extending the glob patterns accordingly. --- diff --git a/3rdparty/icons/breeze_dark_icon_theme.qrc b/3rdparty/icons/breeze_dark_icon_theme.qrc deleted file mode 100644 index 93dcd415..00000000 --- a/3rdparty/icons/breeze_dark_icon_theme.qrc +++ /dev/null @@ -1,219 +0,0 @@ - - - breeze-dark/actions/16/application-exit.svg - breeze-dark/actions/16/configure-shortcuts.svg - breeze-dark/actions/16/configure.svg - breeze-dark/actions/16/dialog-cancel.svg - breeze-dark/actions/16/dialog-close.svg - breeze-dark/actions/16/document-edit.svg - breeze-dark/actions/16/document-encrypt.svg - breeze-dark/actions/16/document-open.svg - breeze-dark/actions/16/download.svg - breeze-dark/actions/16/edit-clear-locationbar-ltr.svg - breeze-dark/actions/16/edit-clear-locationbar-rtl.svg - breeze-dark/actions/16/edit-clear.svg - breeze-dark/actions/16/edit-copy.svg - breeze-dark/actions/16/edit-delete.svg - breeze-dark/actions/16/edit-find.svg - breeze-dark/actions/16/edit-rename.svg - breeze-dark/actions/16/flag-blue.svg - breeze-dark/actions/16/format-fill-color.svg - breeze-dark/actions/16/format-list-unordered.svg - breeze-dark/actions/16/format-text-bold.svg - breeze-dark/actions/16/format-text-color.svg - breeze-dark/actions/16/format-text-italic.svg - breeze-dark/actions/16/format-text-underline.svg - breeze-dark/actions/16/go-down.svg - breeze-dark/actions/16/go-next-view.svg - breeze-dark/actions/16/go-next.svg - breeze-dark/actions/16/go-previous-view.svg - breeze-dark/actions/16/go-previous.svg - breeze-dark/actions/16/go-up.svg - breeze-dark/actions/16/help-about.svg - breeze-dark/actions/16/im-ban-kick-user.svg - breeze-dark/actions/16/im-ban-user.svg - breeze-dark/actions/16/im-kick-user.svg - breeze-dark/actions/16/im-user-away.svg - breeze-dark/actions/16/im-user-offline.svg - breeze-dark/actions/16/im-user-online.svg - breeze-dark/actions/16/im-user.svg - breeze-dark/actions/16/irc-channel-active.svg - breeze-dark/actions/16/irc-channel-inactive.svg - breeze-dark/actions/16/irc-close-channel.svg - breeze-dark/actions/16/irc-join-channel.svg - breeze-dark/actions/16/list-add-user.svg - breeze-dark/actions/16/list-add.svg - breeze-dark/actions/16/list-remove-user.svg - breeze-dark/actions/16/mail-message-new.svg - breeze-dark/actions/16/media-playback-start.svg - breeze-dark/actions/16/network-connect.svg - breeze-dark/actions/16/network-disconnect.svg - breeze-dark/actions/16/show-menu.svg - breeze-dark/actions/16/tools-report-bug.svg - breeze-dark/actions/16/view-fullscreen.svg - breeze-dark/actions/16/view-refresh.svg - breeze-dark/actions/16/zoom-in.svg - breeze-dark/actions/16/zoom-original.svg - breeze-dark/actions/16/zoom-out.svg - breeze-dark/actions/22/application-exit.svg - breeze-dark/actions/22/configure-shortcuts.svg - breeze-dark/actions/22/configure.svg - breeze-dark/actions/22/dialog-cancel.svg - breeze-dark/actions/22/dialog-close.svg - breeze-dark/actions/22/document-edit.svg - breeze-dark/actions/22/document-encrypt.svg - breeze-dark/actions/22/document-open.svg - breeze-dark/actions/22/download.svg - breeze-dark/actions/22/edit-clear-locationbar-ltr.svg - breeze-dark/actions/22/edit-clear-locationbar-rtl.svg - breeze-dark/actions/22/edit-clear.svg - breeze-dark/actions/22/edit-copy.svg - breeze-dark/actions/22/edit-delete.svg - breeze-dark/actions/22/edit-find.svg - breeze-dark/actions/22/edit-rename.svg - breeze-dark/actions/22/flag-blue.svg - breeze-dark/actions/22/format-fill-color.svg - breeze-dark/actions/22/format-list-unordered.svg - breeze-dark/actions/22/format-text-bold.svg - breeze-dark/actions/22/format-text-color.svg - breeze-dark/actions/22/format-text-italic.svg - breeze-dark/actions/22/format-text-underline.svg - breeze-dark/actions/22/go-down.svg - breeze-dark/actions/22/go-next-view.svg - breeze-dark/actions/22/go-next.svg - breeze-dark/actions/22/go-previous-view.svg - breeze-dark/actions/22/go-previous.svg - breeze-dark/actions/22/go-up.svg - breeze-dark/actions/22/help-about.svg - breeze-dark/actions/22/im-ban-kick-user.svg - breeze-dark/actions/22/im-ban-user.svg - breeze-dark/actions/22/im-kick-user.svg - breeze-dark/actions/22/im-user-away.svg - breeze-dark/actions/22/im-user-offline.svg - breeze-dark/actions/22/im-user-online.svg - breeze-dark/actions/22/im-user.svg - breeze-dark/actions/22/irc-channel-active.svg - breeze-dark/actions/22/irc-channel-inactive.svg - breeze-dark/actions/22/irc-close-channel.svg - breeze-dark/actions/22/irc-join-channel.svg - breeze-dark/actions/22/irc-operator.svg - breeze-dark/actions/22/irc-remove-operator.svg - breeze-dark/actions/22/irc-unvoice.svg - breeze-dark/actions/22/irc-voice.svg - breeze-dark/actions/22/list-add-user.svg - breeze-dark/actions/22/list-add.svg - breeze-dark/actions/22/list-remove-user.svg - breeze-dark/actions/22/mail-message-new.svg - breeze-dark/actions/22/media-playback-start.svg - breeze-dark/actions/22/network-connect.svg - breeze-dark/actions/22/network-disconnect.svg - breeze-dark/actions/22/show-menu.svg - breeze-dark/actions/22/tools-report-bug.svg - breeze-dark/actions/22/view-fullscreen.svg - breeze-dark/actions/22/view-refresh.svg - breeze-dark/actions/22/zoom-in.svg - breeze-dark/actions/22/zoom-original.svg - breeze-dark/actions/22/zoom-out.svg - breeze-dark/actions/24/application-exit.svg - breeze-dark/actions/24/configure-shortcuts.svg - breeze-dark/actions/24/configure.svg - breeze-dark/actions/24/dialog-cancel.svg - breeze-dark/actions/24/dialog-close.svg - breeze-dark/actions/24/document-edit.svg - breeze-dark/actions/24/document-encrypt.svg - breeze-dark/actions/24/document-open.svg - breeze-dark/actions/24/download.svg - breeze-dark/actions/24/edit-clear-locationbar-ltr.svg - breeze-dark/actions/24/edit-clear-locationbar-rtl.svg - breeze-dark/actions/24/edit-clear.svg - breeze-dark/actions/24/edit-copy.svg - breeze-dark/actions/24/edit-delete.svg - breeze-dark/actions/24/edit-find.svg - breeze-dark/actions/24/edit-rename.svg - breeze-dark/actions/24/flag-blue.svg - breeze-dark/actions/24/format-fill-color.svg - breeze-dark/actions/24/format-list-unordered.svg - breeze-dark/actions/24/format-text-bold.svg - breeze-dark/actions/24/format-text-color.svg - breeze-dark/actions/24/format-text-italic.svg - breeze-dark/actions/24/format-text-underline.svg - breeze-dark/actions/24/go-down.svg - breeze-dark/actions/24/go-next-view.svg - breeze-dark/actions/24/go-next.svg - breeze-dark/actions/24/go-previous-view.svg - breeze-dark/actions/24/go-previous.svg - breeze-dark/actions/24/go-up.svg - breeze-dark/actions/24/help-about.svg - breeze-dark/actions/24/im-ban-kick-user.svg - breeze-dark/actions/24/im-ban-user.svg - breeze-dark/actions/24/im-kick-user.svg - breeze-dark/actions/24/im-user-away.svg - breeze-dark/actions/24/im-user-offline.svg - breeze-dark/actions/24/im-user-online.svg - breeze-dark/actions/24/im-user.svg - breeze-dark/actions/24/irc-channel-active.svg - breeze-dark/actions/24/irc-channel-inactive.svg - breeze-dark/actions/24/irc-close-channel.svg - breeze-dark/actions/24/irc-join-channel.svg - breeze-dark/actions/24/irc-operator.svg - breeze-dark/actions/24/irc-remove-operator.svg - breeze-dark/actions/24/irc-unvoice.svg - breeze-dark/actions/24/irc-voice.svg - breeze-dark/actions/24/list-add-user.svg - breeze-dark/actions/24/list-add.svg - breeze-dark/actions/24/list-remove-user.svg - breeze-dark/actions/24/mail-message-new.svg - breeze-dark/actions/24/media-playback-start.svg - breeze-dark/actions/24/network-connect.svg - breeze-dark/actions/24/network-disconnect.svg - breeze-dark/actions/24/show-menu.svg - breeze-dark/actions/24/tools-report-bug.svg - breeze-dark/actions/24/view-fullscreen.svg - breeze-dark/actions/24/view-refresh.svg - breeze-dark/actions/24/zoom-in.svg - breeze-dark/actions/24/zoom-original.svg - breeze-dark/actions/24/zoom-out.svg - breeze-dark/actions/32/application-exit.svg - breeze-dark/actions/32/configure-shortcuts.svg - breeze-dark/actions/32/configure.svg - breeze-dark/actions/32/dialog-cancel.svg - breeze-dark/actions/32/document-edit.svg - breeze-dark/actions/32/document-open.svg - breeze-dark/actions/32/edit-delete.svg - breeze-dark/actions/32/go-down.svg - breeze-dark/actions/32/go-next.svg - breeze-dark/actions/32/go-previous.svg - breeze-dark/actions/32/go-up.svg - breeze-dark/actions/32/help-about.svg - breeze-dark/actions/32/mail-message-new.svg - breeze-dark/actions/32/media-playback-start.svg - breeze-dark/actions/32/view-refresh.svg - breeze-dark/actions/32/zoom-in.svg - breeze-dark/actions/32/zoom-original.svg - breeze-dark/actions/32/zoom-out.svg - breeze-dark/devices/16/network-wired.svg - breeze-dark/devices/22/network-wired.svg - breeze-dark/index.theme - breeze-dark/preferences/32/help-about.svg - breeze-dark/status/16/dialog-information.svg - breeze-dark/status/16/security-high.svg - breeze-dark/status/16/security-low.svg - breeze-dark/status/16/user-available.svg - breeze-dark/status/16/user-away.svg - breeze-dark/status/16/user-offline.svg - breeze-dark/status/22/dialog-information.svg - breeze-dark/status/22/dialog-password.svg - breeze-dark/status/22/network-wired.svg - breeze-dark/status/22/security-high.svg - breeze-dark/status/22/security-low.svg - breeze-dark/status/22/user-available.svg - breeze-dark/status/22/user-away.svg - breeze-dark/status/22/user-offline.svg - breeze-dark/status/24/dialog-information.svg - breeze-dark/status/64/dialog-information.svg - breeze-dark/status/64/dialog-password.svg - breeze-dark/status/64/dialog-warning.svg - breeze-dark/status/64/security-high.svg - breeze-dark/status/64/security-low.svg - - diff --git a/3rdparty/icons/breeze_icon_theme.qrc b/3rdparty/icons/breeze_icon_theme.qrc deleted file mode 100644 index 5bf63159..00000000 --- a/3rdparty/icons/breeze_icon_theme.qrc +++ /dev/null @@ -1,218 +0,0 @@ - - - breeze/actions/16/application-exit.svg - breeze/actions/16/configure-shortcuts.svg - breeze/actions/16/configure.svg - breeze/actions/16/dialog-cancel.svg - breeze/actions/16/dialog-close.svg - breeze/actions/16/document-edit.svg - breeze/actions/16/document-encrypt.svg - breeze/actions/16/document-open.svg - breeze/actions/16/download.svg - breeze/actions/16/edit-clear-locationbar-ltr.svg - breeze/actions/16/edit-clear-locationbar-rtl.svg - breeze/actions/16/edit-clear.svg - breeze/actions/16/edit-copy.svg - breeze/actions/16/edit-delete.svg - breeze/actions/16/edit-find.svg - breeze/actions/16/edit-rename.svg - breeze/actions/16/flag-blue.svg - breeze/actions/16/format-fill-color.svg - breeze/actions/16/format-list-unordered.svg - breeze/actions/16/format-text-bold.svg - breeze/actions/16/format-text-color.svg - breeze/actions/16/format-text-italic.svg - breeze/actions/16/format-text-underline.svg - breeze/actions/16/go-down.svg - breeze/actions/16/go-next-view.svg - breeze/actions/16/go-next.svg - breeze/actions/16/go-previous-view.svg - breeze/actions/16/go-previous.svg - breeze/actions/16/go-up.svg - breeze/actions/16/help-about.svg - breeze/actions/16/im-ban-kick-user.svg - breeze/actions/16/im-ban-user.svg - breeze/actions/16/im-kick-user.svg - breeze/actions/16/im-user-away.svg - breeze/actions/16/im-user-offline.svg - breeze/actions/16/im-user-online.svg - breeze/actions/16/im-user.svg - breeze/actions/16/irc-channel-active.svg - breeze/actions/16/irc-channel-inactive.svg - breeze/actions/16/irc-close-channel.svg - breeze/actions/16/irc-join-channel.svg - breeze/actions/16/list-add-user.svg - breeze/actions/16/list-add.svg - breeze/actions/16/list-remove-user.svg - breeze/actions/16/mail-message-new.svg - breeze/actions/16/media-playback-start.svg - breeze/actions/16/network-connect.svg - breeze/actions/16/network-disconnect.svg - breeze/actions/16/show-menu.svg - breeze/actions/16/tools-report-bug.svg - breeze/actions/16/view-fullscreen.svg - breeze/actions/16/view-refresh.svg - breeze/actions/16/zoom-in.svg - breeze/actions/16/zoom-original.svg - breeze/actions/16/zoom-out.svg - breeze/actions/22/application-exit.svg - breeze/actions/22/configure-shortcuts.svg - breeze/actions/22/configure.svg - breeze/actions/22/dialog-cancel.svg - breeze/actions/22/dialog-close.svg - breeze/actions/22/document-edit.svg - breeze/actions/22/document-encrypt.svg - breeze/actions/22/document-open.svg - breeze/actions/22/download.svg - breeze/actions/22/edit-clear-locationbar-ltr.svg - breeze/actions/22/edit-clear-locationbar-rtl.svg - breeze/actions/22/edit-clear.svg - breeze/actions/22/edit-copy.svg - breeze/actions/22/edit-delete.svg - breeze/actions/22/edit-find.svg - breeze/actions/22/edit-rename.svg - breeze/actions/22/flag-blue.svg - breeze/actions/22/format-fill-color.svg - breeze/actions/22/format-list-unordered.svg - breeze/actions/22/format-text-bold.svg - breeze/actions/22/format-text-color.svg - breeze/actions/22/format-text-italic.svg - breeze/actions/22/format-text-underline.svg - breeze/actions/22/go-down.svg - breeze/actions/22/go-next-view.svg - breeze/actions/22/go-next.svg - breeze/actions/22/go-previous-view.svg - breeze/actions/22/go-previous.svg - breeze/actions/22/go-up.svg - breeze/actions/22/help-about.svg - breeze/actions/22/im-ban-kick-user.svg - breeze/actions/22/im-ban-user.svg - breeze/actions/22/im-kick-user.svg - breeze/actions/22/im-user-away.svg - breeze/actions/22/im-user-offline.svg - breeze/actions/22/im-user-online.svg - breeze/actions/22/im-user.svg - breeze/actions/22/irc-channel-active.svg - breeze/actions/22/irc-channel-inactive.svg - breeze/actions/22/irc-close-channel.svg - breeze/actions/22/irc-join-channel.svg - breeze/actions/22/irc-operator.svg - breeze/actions/22/irc-remove-operator.svg - breeze/actions/22/irc-unvoice.svg - breeze/actions/22/irc-voice.svg - breeze/actions/22/list-add-user.svg - breeze/actions/22/list-add.svg - breeze/actions/22/list-remove-user.svg - breeze/actions/22/mail-message-new.svg - breeze/actions/22/media-playback-start.svg - breeze/actions/22/network-connect.svg - breeze/actions/22/network-disconnect.svg - breeze/actions/22/show-menu.svg - breeze/actions/22/tools-report-bug.svg - breeze/actions/22/view-fullscreen.svg - breeze/actions/22/view-refresh.svg - breeze/actions/22/zoom-in.svg - breeze/actions/22/zoom-original.svg - breeze/actions/22/zoom-out.svg - breeze/actions/24/application-exit.svg - breeze/actions/24/configure-shortcuts.svg - breeze/actions/24/configure.svg - breeze/actions/24/dialog-cancel.svg - breeze/actions/24/dialog-close.svg - breeze/actions/24/document-edit.svg - breeze/actions/24/document-encrypt.svg - breeze/actions/24/document-open.svg - breeze/actions/24/download.svg - breeze/actions/24/edit-clear-locationbar-ltr.svg - breeze/actions/24/edit-clear-locationbar-rtl.svg - breeze/actions/24/edit-clear.svg - breeze/actions/24/edit-copy.svg - breeze/actions/24/edit-delete.svg - breeze/actions/24/edit-find.svg - breeze/actions/24/edit-rename.svg - breeze/actions/24/flag-blue.svg - breeze/actions/24/format-fill-color.svg - breeze/actions/24/format-list-unordered.svg - breeze/actions/24/format-text-bold.svg - breeze/actions/24/format-text-color.svg - breeze/actions/24/format-text-italic.svg - breeze/actions/24/format-text-underline.svg - breeze/actions/24/go-down.svg - breeze/actions/24/go-next-view.svg - breeze/actions/24/go-next.svg - breeze/actions/24/go-previous-view.svg - breeze/actions/24/go-previous.svg - breeze/actions/24/go-up.svg - breeze/actions/24/help-about.svg - breeze/actions/24/im-ban-kick-user.svg - breeze/actions/24/im-ban-user.svg - breeze/actions/24/im-kick-user.svg - breeze/actions/24/im-user-away.svg - breeze/actions/24/im-user-offline.svg - breeze/actions/24/im-user-online.svg - breeze/actions/24/im-user.svg - breeze/actions/24/irc-channel-active.svg - breeze/actions/24/irc-channel-inactive.svg - breeze/actions/24/irc-close-channel.svg - breeze/actions/24/irc-join-channel.svg - breeze/actions/24/irc-operator.svg - breeze/actions/24/irc-remove-operator.svg - breeze/actions/24/irc-unvoice.svg - breeze/actions/24/irc-voice.svg - breeze/actions/24/list-add-user.svg - breeze/actions/24/list-add.svg - breeze/actions/24/list-remove-user.svg - breeze/actions/24/mail-message-new.svg - breeze/actions/24/media-playback-start.svg - breeze/actions/24/network-connect.svg - breeze/actions/24/network-disconnect.svg - breeze/actions/24/show-menu.svg - breeze/actions/24/tools-report-bug.svg - breeze/actions/24/view-fullscreen.svg - breeze/actions/24/view-refresh.svg - breeze/actions/24/zoom-in.svg - breeze/actions/24/zoom-original.svg - breeze/actions/24/zoom-out.svg - breeze/actions/32/application-exit.svg - breeze/actions/32/configure-shortcuts.svg - breeze/actions/32/configure.svg - breeze/actions/32/dialog-cancel.svg - breeze/actions/32/document-edit.svg - breeze/actions/32/document-open.svg - breeze/actions/32/edit-delete.svg - breeze/actions/32/go-down.svg - breeze/actions/32/go-next.svg - breeze/actions/32/go-previous.svg - breeze/actions/32/go-up.svg - breeze/actions/32/help-about.svg - breeze/actions/32/mail-message-new.svg - breeze/actions/32/media-playback-start.svg - breeze/actions/32/view-refresh.svg - breeze/actions/32/zoom-in.svg - breeze/actions/32/zoom-original.svg - breeze/actions/32/zoom-out.svg - breeze/devices/16/network-wired.svg - breeze/devices/22/network-wired.svg - breeze/index.theme - breeze/preferences/32/help-about.svg - breeze/status/16/dialog-information.svg - breeze/status/16/security-high.svg - breeze/status/16/security-low.svg - breeze/status/16/user-available.svg - breeze/status/16/user-away.svg - breeze/status/16/user-offline.svg - breeze/status/22/dialog-information.svg - breeze/status/22/dialog-password.svg - breeze/status/22/network-wired.svg - breeze/status/22/security-high.svg - breeze/status/22/security-low.svg - breeze/status/22/user-available.svg - breeze/status/22/user-away.svg - breeze/status/22/user-offline.svg - breeze/status/64/dialog-information.svg - breeze/status/64/dialog-password.svg - breeze/status/64/dialog-warning.svg - breeze/status/64/security-high.svg - breeze/status/64/security-low.svg - - diff --git a/3rdparty/icons/oxygen_icon_theme.qrc b/3rdparty/icons/oxygen_icon_theme.qrc deleted file mode 100644 index f18e749d..00000000 --- a/3rdparty/icons/oxygen_icon_theme.qrc +++ /dev/null @@ -1,309 +0,0 @@ - - - oxygen/128x128/actions/application-exit.png - oxygen/128x128/actions/configure.png - oxygen/128x128/actions/document-edit.png - oxygen/128x128/actions/edit-find.png - oxygen/128x128/actions/go-down.png - oxygen/128x128/actions/go-next.png - oxygen/128x128/actions/go-previous.png - oxygen/128x128/actions/go-up.png - oxygen/128x128/actions/im-ban-kick-user.png - oxygen/128x128/actions/im-ban-user.png - oxygen/128x128/actions/im-kick-user.png - oxygen/128x128/actions/im-user-away.png - oxygen/128x128/actions/im-user-offline.png - oxygen/128x128/actions/im-user.png - oxygen/128x128/actions/list-add-user.png - oxygen/128x128/actions/mail-message-new.png - oxygen/128x128/actions/tools-report-bug.png - oxygen/128x128/devices/network-wired.png - oxygen/128x128/status/dialog-information.png - oxygen/128x128/status/dialog-password.png - oxygen/128x128/status/dialog-warning.png - oxygen/128x128/status/security-high.png - oxygen/128x128/status/security-low.png - oxygen/16x16/actions/application-exit.png - oxygen/16x16/actions/configure-shortcuts.png - oxygen/16x16/actions/configure.png - oxygen/16x16/actions/dialog-cancel.png - oxygen/16x16/actions/dialog-close.png - oxygen/16x16/actions/document-edit.png - oxygen/16x16/actions/document-encrypt.png - oxygen/16x16/actions/document-open.png - oxygen/16x16/actions/download.png - oxygen/16x16/actions/edit-clear-locationbar-ltr.png - oxygen/16x16/actions/edit-clear-locationbar-rtl.png - oxygen/16x16/actions/edit-clear.png - oxygen/16x16/actions/edit-copy.png - oxygen/16x16/actions/edit-delete.png - oxygen/16x16/actions/edit-find.png - oxygen/16x16/actions/edit-rename.png - oxygen/16x16/actions/flag-blue.png - oxygen/16x16/actions/format-fill-color.png - oxygen/16x16/actions/format-list-unordered.png - oxygen/16x16/actions/format-text-bold.png - oxygen/16x16/actions/format-text-color.png - oxygen/16x16/actions/format-text-italic.png - oxygen/16x16/actions/format-text-underline.png - oxygen/16x16/actions/go-down.png - oxygen/16x16/actions/go-next-view.png - oxygen/16x16/actions/go-next.png - oxygen/16x16/actions/go-previous-view.png - oxygen/16x16/actions/go-previous.png - oxygen/16x16/actions/go-up.png - oxygen/16x16/actions/help-about.png - oxygen/16x16/actions/im-ban-kick-user.png - oxygen/16x16/actions/im-ban-user.png - oxygen/16x16/actions/im-kick-user.png - oxygen/16x16/actions/im-user-away.png - oxygen/16x16/actions/im-user-offline.png - oxygen/16x16/actions/im-user.png - oxygen/16x16/actions/irc-close-channel.png - oxygen/16x16/actions/irc-join-channel.png - oxygen/16x16/actions/irc-operator.png - oxygen/16x16/actions/irc-remove-operator.png - oxygen/16x16/actions/irc-unvoice.png - oxygen/16x16/actions/irc-voice.png - oxygen/16x16/actions/list-add-user.png - oxygen/16x16/actions/list-add.png - oxygen/16x16/actions/list-remove-user.png - oxygen/16x16/actions/mail-message-new.png - oxygen/16x16/actions/media-playback-start.png - oxygen/16x16/actions/network-connect.png - oxygen/16x16/actions/network-disconnect.png - oxygen/16x16/actions/show-menu.png - oxygen/16x16/actions/tools-report-bug.png - oxygen/16x16/actions/view-fullscreen.png - oxygen/16x16/actions/view-refresh.png - oxygen/16x16/actions/zoom-in.png - oxygen/16x16/actions/zoom-original.png - oxygen/16x16/actions/zoom-out.png - oxygen/16x16/devices/network-wired.png - oxygen/16x16/status/dialog-information.png - oxygen/16x16/status/dialog-password.png - oxygen/16x16/status/dialog-warning.png - oxygen/16x16/status/security-high.png - oxygen/16x16/status/security-low.png - oxygen/16x16/status/user-away.png - oxygen/16x16/status/user-offline.png - oxygen/22x22/actions/application-exit.png - oxygen/22x22/actions/configure-shortcuts.png - oxygen/22x22/actions/configure.png - oxygen/22x22/actions/dialog-cancel.png - oxygen/22x22/actions/dialog-close.png - oxygen/22x22/actions/document-edit.png - oxygen/22x22/actions/document-encrypt.png - oxygen/22x22/actions/document-open.png - oxygen/22x22/actions/download.png - oxygen/22x22/actions/edit-clear-locationbar-ltr.png - oxygen/22x22/actions/edit-clear-locationbar-rtl.png - oxygen/22x22/actions/edit-clear.png - oxygen/22x22/actions/edit-copy.png - oxygen/22x22/actions/edit-delete.png - oxygen/22x22/actions/edit-find.png - oxygen/22x22/actions/edit-rename.png - oxygen/22x22/actions/flag-blue.png - oxygen/22x22/actions/format-fill-color.png - oxygen/22x22/actions/format-list-unordered.png - oxygen/22x22/actions/format-text-bold.png - oxygen/22x22/actions/format-text-color.png - oxygen/22x22/actions/format-text-italic.png - oxygen/22x22/actions/format-text-underline.png - oxygen/22x22/actions/go-down.png - oxygen/22x22/actions/go-next-view.png - oxygen/22x22/actions/go-next.png - oxygen/22x22/actions/go-previous-view.png - oxygen/22x22/actions/go-previous.png - oxygen/22x22/actions/go-up.png - oxygen/22x22/actions/help-about.png - oxygen/22x22/actions/im-ban-kick-user.png - oxygen/22x22/actions/im-ban-user.png - oxygen/22x22/actions/im-kick-user.png - oxygen/22x22/actions/im-user-away.png - oxygen/22x22/actions/im-user-offline.png - oxygen/22x22/actions/im-user.png - oxygen/22x22/actions/irc-close-channel.png - oxygen/22x22/actions/irc-join-channel.png - oxygen/22x22/actions/irc-operator.png - oxygen/22x22/actions/irc-remove-operator.png - oxygen/22x22/actions/irc-unvoice.png - oxygen/22x22/actions/irc-voice.png - oxygen/22x22/actions/list-add-user.png - oxygen/22x22/actions/list-add.png - oxygen/22x22/actions/list-remove-user.png - oxygen/22x22/actions/mail-message-new.png - oxygen/22x22/actions/media-playback-start.png - oxygen/22x22/actions/network-connect.png - oxygen/22x22/actions/network-disconnect.png - oxygen/22x22/actions/show-menu.png - oxygen/22x22/actions/tools-report-bug.png - oxygen/22x22/actions/view-fullscreen.png - oxygen/22x22/actions/view-refresh.png - oxygen/22x22/actions/zoom-in.png - oxygen/22x22/actions/zoom-original.png - oxygen/22x22/actions/zoom-out.png - oxygen/22x22/devices/network-wired.png - oxygen/22x22/status/dialog-information.png - oxygen/22x22/status/dialog-password.png - oxygen/22x22/status/dialog-warning.png - oxygen/22x22/status/security-high.png - oxygen/22x22/status/security-low.png - oxygen/22x22/status/user-away.png - oxygen/22x22/status/user-offline.png - oxygen/256x256/devices/network-wired.png - oxygen/32x32/actions/application-exit.png - oxygen/32x32/actions/configure-shortcuts.png - oxygen/32x32/actions/configure.png - oxygen/32x32/actions/dialog-cancel.png - oxygen/32x32/actions/dialog-close.png - oxygen/32x32/actions/document-edit.png - oxygen/32x32/actions/document-encrypt.png - oxygen/32x32/actions/document-open.png - oxygen/32x32/actions/download.png - oxygen/32x32/actions/edit-clear-locationbar-ltr.png - oxygen/32x32/actions/edit-clear-locationbar-rtl.png - oxygen/32x32/actions/edit-clear.png - oxygen/32x32/actions/edit-copy.png - oxygen/32x32/actions/edit-delete.png - oxygen/32x32/actions/edit-find.png - oxygen/32x32/actions/edit-rename.png - oxygen/32x32/actions/flag-blue.png - oxygen/32x32/actions/format-fill-color.png - oxygen/32x32/actions/format-list-unordered.png - oxygen/32x32/actions/format-text-bold.png - oxygen/32x32/actions/format-text-color.png - oxygen/32x32/actions/format-text-italic.png - oxygen/32x32/actions/format-text-underline.png - oxygen/32x32/actions/go-down.png - oxygen/32x32/actions/go-next-view.png - oxygen/32x32/actions/go-next.png - oxygen/32x32/actions/go-previous-view.png - oxygen/32x32/actions/go-previous.png - oxygen/32x32/actions/go-up.png - oxygen/32x32/actions/help-about.png - oxygen/32x32/actions/im-ban-kick-user.png - oxygen/32x32/actions/im-ban-user.png - oxygen/32x32/actions/im-kick-user.png - oxygen/32x32/actions/im-user-away.png - oxygen/32x32/actions/im-user-offline.png - oxygen/32x32/actions/im-user.png - oxygen/32x32/actions/irc-close-channel.png - oxygen/32x32/actions/irc-join-channel.png - oxygen/32x32/actions/irc-operator.png - oxygen/32x32/actions/irc-remove-operator.png - oxygen/32x32/actions/irc-unvoice.png - oxygen/32x32/actions/irc-voice.png - oxygen/32x32/actions/list-add-user.png - oxygen/32x32/actions/list-add.png - oxygen/32x32/actions/list-remove-user.png - oxygen/32x32/actions/mail-message-new.png - oxygen/32x32/actions/media-playback-start.png - oxygen/32x32/actions/network-connect.png - oxygen/32x32/actions/network-disconnect.png - oxygen/32x32/actions/show-menu.png - oxygen/32x32/actions/tools-report-bug.png - oxygen/32x32/actions/view-fullscreen.png - oxygen/32x32/actions/view-refresh.png - oxygen/32x32/actions/zoom-in.png - oxygen/32x32/actions/zoom-original.png - oxygen/32x32/actions/zoom-out.png - oxygen/32x32/devices/network-wired.png - oxygen/32x32/status/dialog-information.png - oxygen/32x32/status/dialog-password.png - oxygen/32x32/status/dialog-warning.png - oxygen/32x32/status/security-high.png - oxygen/32x32/status/security-low.png - oxygen/32x32/status/user-away.png - oxygen/32x32/status/user-offline.png - oxygen/48x48/actions/application-exit.png - oxygen/48x48/actions/configure-shortcuts.png - oxygen/48x48/actions/configure.png - oxygen/48x48/actions/dialog-cancel.png - oxygen/48x48/actions/dialog-close.png - oxygen/48x48/actions/document-edit.png - oxygen/48x48/actions/document-encrypt.png - oxygen/48x48/actions/document-open.png - oxygen/48x48/actions/download.png - oxygen/48x48/actions/edit-clear-locationbar-ltr.png - oxygen/48x48/actions/edit-clear-locationbar-rtl.png - oxygen/48x48/actions/edit-clear.png - oxygen/48x48/actions/edit-copy.png - oxygen/48x48/actions/edit-delete.png - oxygen/48x48/actions/edit-find.png - oxygen/48x48/actions/edit-rename.png - oxygen/48x48/actions/flag-blue.png - oxygen/48x48/actions/format-fill-color.png - oxygen/48x48/actions/format-list-unordered.png - oxygen/48x48/actions/format-text-bold.png - oxygen/48x48/actions/format-text-color.png - oxygen/48x48/actions/format-text-italic.png - oxygen/48x48/actions/format-text-underline.png - oxygen/48x48/actions/go-down.png - oxygen/48x48/actions/go-next-view.png - oxygen/48x48/actions/go-next.png - oxygen/48x48/actions/go-previous-view.png - oxygen/48x48/actions/go-previous.png - oxygen/48x48/actions/go-up.png - oxygen/48x48/actions/help-about.png - oxygen/48x48/actions/im-ban-kick-user.png - oxygen/48x48/actions/im-ban-user.png - oxygen/48x48/actions/im-kick-user.png - oxygen/48x48/actions/im-user-away.png - oxygen/48x48/actions/im-user-offline.png - oxygen/48x48/actions/im-user.png - oxygen/48x48/actions/irc-close-channel.png - oxygen/48x48/actions/irc-join-channel.png - oxygen/48x48/actions/irc-operator.png - oxygen/48x48/actions/irc-remove-operator.png - oxygen/48x48/actions/irc-unvoice.png - oxygen/48x48/actions/irc-voice.png - oxygen/48x48/actions/list-add-user.png - oxygen/48x48/actions/list-add.png - oxygen/48x48/actions/list-remove-user.png - oxygen/48x48/actions/mail-message-new.png - oxygen/48x48/actions/media-playback-start.png - oxygen/48x48/actions/network-connect.png - oxygen/48x48/actions/network-disconnect.png - oxygen/48x48/actions/show-menu.png - oxygen/48x48/actions/tools-report-bug.png - oxygen/48x48/actions/view-fullscreen.png - oxygen/48x48/actions/view-refresh.png - oxygen/48x48/actions/zoom-in.png - oxygen/48x48/actions/zoom-original.png - oxygen/48x48/actions/zoom-out.png - oxygen/48x48/devices/network-wired.png - oxygen/48x48/status/dialog-information.png - oxygen/48x48/status/dialog-password.png - oxygen/48x48/status/dialog-warning.png - oxygen/48x48/status/security-high.png - oxygen/48x48/status/security-low.png - oxygen/48x48/status/user-away.png - oxygen/48x48/status/user-offline.png - oxygen/64x64/actions/application-exit.png - oxygen/64x64/actions/configure.png - oxygen/64x64/actions/document-edit.png - oxygen/64x64/actions/edit-find.png - oxygen/64x64/actions/go-down.png - oxygen/64x64/actions/go-next.png - oxygen/64x64/actions/go-previous.png - oxygen/64x64/actions/go-up.png - oxygen/64x64/actions/im-ban-kick-user.png - oxygen/64x64/actions/im-ban-user.png - oxygen/64x64/actions/im-kick-user.png - oxygen/64x64/actions/im-user-away.png - oxygen/64x64/actions/im-user-offline.png - oxygen/64x64/actions/im-user.png - oxygen/64x64/actions/list-add-user.png - oxygen/64x64/actions/tools-report-bug.png - oxygen/64x64/devices/network-wired.png - oxygen/64x64/status/dialog-information.png - oxygen/64x64/status/dialog-password.png - oxygen/64x64/status/dialog-warning.png - oxygen/64x64/status/security-high.png - oxygen/64x64/status/security-low.png - oxygen/64x64/status/user-away.png - oxygen/64x64/status/user-offline.png - oxygen/index.theme - - diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 0986abb8..536d82a6 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -14,7 +14,10 @@ if (BUILD_GUI) endif() if (EMBED_DATA) - set(CLIENT_RCS ${CLIENT_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/data.qrc PARENT_SCOPE) + quassel_add_resource(Data PREFIX data PATTERNS + networks.ini + stylesheets/default.qss + ) else() install(FILES networks.ini DESTINATION ${CMAKE_INSTALL_DATADIR}/quassel) install(DIRECTORY stylesheets DESTINATION ${CMAKE_INSTALL_DATADIR}/quassel) diff --git a/data/data.qrc b/data/data.qrc deleted file mode 100644 index 78a9ed8f..00000000 --- a/data/data.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - stylesheets/default.qss - networks.ini - - diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index ca4df01a..4780efc1 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -7,27 +7,30 @@ if (WANT_MONO OR WANT_QTCLIENT) set(BUNDLED_ICON_THEME_DIR ${CMAKE_SOURCE_DIR}/3rdparty/icons) - # Always embed a hicolor fallback containing the most important (e.g. tray) icons - list(APPEND ICON_RCS ${CMAKE_CURRENT_SOURCE_DIR}/hicolor_icons.qrc) + # Always embed a hicolor fallback containing the most important (e.g. tray) icons. + # The .qrc contains aliases, so it's best to keep this manually written rather than autogenerated. + quassel_add_module(Resource::HicolorIcons) + target_sources(${TARGET} PRIVATE hicolor_icons.qrc) + set_target_properties(${TARGET} PROPERTIES AUTOMOC OFF AUTOUIC OFF) if (EMBED_DATA) # Always embed quassel-specific icons message(STATUS "Embedding Quassel-specific icons") - list(APPEND ICON_RCS ${CMAKE_CURRENT_SOURCE_DIR}/breeze_icons.qrc) - list(APPEND ICON_RCS ${CMAKE_CURRENT_SOURCE_DIR}/breeze_dark_icons.qrc) + set(patterns breeze*/*.svg) if (WITH_OXYGEN_ICONS) - list(APPEND ICON_RCS ${CMAKE_CURRENT_SOURCE_DIR}/oxygen_icons.qrc) + list(APPEND patterns oxygen/*.png) endif() + quassel_add_resource(Icons PREFIX icons PATTERNS ${patterns}) if (WITH_BUNDLED_ICONS) message(STATUS "Embedding bundled Breeze icon theme") - list(APPEND ICON_RCS ${BUNDLED_ICON_THEME_DIR}/breeze_icon_theme.qrc) - list(APPEND ICON_RCS ${BUNDLED_ICON_THEME_DIR}/breeze_dark_icon_theme.qrc) + set(patterns breeze*/*.svg breeze*/index.theme) if (WITH_OXYGEN_ICONS) message(STATUS "Embedding bundled Oxygen icon theme") - list(APPEND ICON_RCS ${BUNDLED_ICON_THEME_DIR}/oxygen_icon_theme.qrc) + list(APPEND patterns oxygen/*.png oxygen/index.theme) endif() endif() + quassel_add_resource(IconThemes PREFIX icons PATTERNS ${patterns} BASEDIR ${BUNDLED_ICON_THEME_DIR}) else() # Always install quassel-specific icons @@ -51,8 +54,6 @@ if (WANT_MONO OR WANT_QTCLIENT) endif() endif() - set(CLIENT_RCS ${CLIENT_RCS} ${ICON_RCS} PARENT_SCOPE) - # Application icon if (HAVE_KDE OR (UNIX AND NOT APPLE)) # hicolor contains the application icon in all relevant sizes diff --git a/icons/breeze_dark_icons.qrc b/icons/breeze_dark_icons.qrc deleted file mode 100644 index 68d93192..00000000 --- a/icons/breeze_dark_icons.qrc +++ /dev/null @@ -1,27 +0,0 @@ - - - breeze-dark/actions/24/connect-quassel.svg - breeze-dark/actions/32/connect-quassel.svg - breeze-dark/actions/24/disconnect-quassel.svg - breeze-dark/actions/32/disconnect-quassel.svg - breeze-dark/apps/32/quassel.svg - breeze-dark/apps/48/quassel.svg - breeze-dark/apps/64/quassel.svg - breeze-dark/status/24/active-quassel-tray.svg - breeze-dark/status/64/active-quassel-tray.svg - breeze-dark/status/24/active-quassel-tray-inverted.svg - breeze-dark/status/64/active-quassel-tray-inverted.svg - breeze-dark/status/24/inactive-quassel.svg - breeze-dark/status/64/inactive-quassel.svg - breeze-dark/status/24/inactive-quassel-tray.svg - breeze-dark/status/64/inactive-quassel-tray.svg - breeze-dark/status/24/inactive-quassel-tray-inverted.svg - breeze-dark/status/64/inactive-quassel-tray-inverted.svg - breeze-dark/status/24/message-quassel.svg - breeze-dark/status/64/message-quassel.svg - breeze-dark/status/24/message-quassel-tray.svg - breeze-dark/status/64/message-quassel-tray.svg - breeze-dark/status/24/message-quassel-tray-inverted.svg - breeze-dark/status/64/message-quassel-tray-inverted.svg - - diff --git a/icons/breeze_icons.qrc b/icons/breeze_icons.qrc deleted file mode 100644 index 2e126f65..00000000 --- a/icons/breeze_icons.qrc +++ /dev/null @@ -1,27 +0,0 @@ - - - breeze/actions/24/connect-quassel.svg - breeze/actions/32/connect-quassel.svg - breeze/actions/24/disconnect-quassel.svg - breeze/actions/32/disconnect-quassel.svg - breeze/apps/32/quassel.svg - breeze/apps/48/quassel.svg - breeze/apps/64/quassel.svg - breeze/status/24/active-quassel-tray.svg - breeze/status/64/active-quassel-tray.svg - breeze/status/24/active-quassel-tray-inverted.svg - breeze/status/64/active-quassel-tray-inverted.svg - breeze/status/24/inactive-quassel.svg - breeze/status/64/inactive-quassel.svg - breeze/status/24/inactive-quassel-tray.svg - breeze/status/64/inactive-quassel-tray.svg - breeze/status/24/inactive-quassel-tray-inverted.svg - breeze/status/64/inactive-quassel-tray-inverted.svg - breeze/status/24/message-quassel.svg - breeze/status/64/message-quassel.svg - breeze/status/24/message-quassel-tray.svg - breeze/status/64/message-quassel-tray.svg - breeze/status/24/message-quassel-tray-inverted.svg - breeze/status/64/message-quassel-tray-inverted.svg - - diff --git a/icons/oxygen_icons.qrc b/icons/oxygen_icons.qrc deleted file mode 100644 index 918a6159..00000000 --- a/icons/oxygen_icons.qrc +++ /dev/null @@ -1,42 +0,0 @@ - - - oxygen/16x16/apps/quassel.png - oxygen/22x22/apps/quassel.png - oxygen/32x32/apps/quassel.png - oxygen/48x48/apps/quassel.png - oxygen/64x64/apps/quassel.png - oxygen/128x128/apps/quassel.png - oxygen/16x16/status/active-quassel.png - oxygen/22x22/status/active-quassel.png - oxygen/32x32/status/active-quassel.png - oxygen/48x48/status/active-quassel.png - oxygen/64x64/status/active-quassel.png - oxygen/128x128/status/active-quassel.png - oxygen/16x16/status/inactive-quassel.png - oxygen/22x22/status/inactive-quassel.png - oxygen/32x32/status/inactive-quassel.png - oxygen/48x48/status/inactive-quassel.png - oxygen/64x64/status/inactive-quassel.png - oxygen/128x128/status/inactive-quassel.png - oxygen/16x16/status/irc-channel-active.png - oxygen/16x16/status/irc-channel-inactive.png - oxygen/16x16/status/message-quassel.png - oxygen/22x22/status/message-quassel.png - oxygen/32x32/status/message-quassel.png - oxygen/48x48/status/message-quassel.png - oxygen/64x64/status/message-quassel.png - oxygen/128x128/status/message-quassel.png - oxygen/16x16/actions/connect-quassel.png - oxygen/22x22/actions/connect-quassel.png - oxygen/32x32/actions/connect-quassel.png - oxygen/48x48/actions/connect-quassel.png - oxygen/64x64/actions/connect-quassel.png - oxygen/128x128/actions/connect-quassel.png - oxygen/16x16/actions/disconnect-quassel.png - oxygen/22x22/actions/disconnect-quassel.png - oxygen/32x32/actions/disconnect-quassel.png - oxygen/48x48/actions/disconnect-quassel.png - oxygen/64x64/actions/disconnect-quassel.png - oxygen/128x128/actions/disconnect-quassel.png - - diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt index d92e3a96..0cd43f63 100644 --- a/pics/CMakeLists.txt +++ b/pics/CMakeLists.txt @@ -15,14 +15,14 @@ if(WIN32) endif() endif() -if(WANT_MONO OR WANT_QTCLIENT) - if(EMBED_DATA) - set(CLIENT_RCS ${CLIENT_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/pics.qrc PARENT_SCOPE) - else() - # We don't find them yet externally, so disable installation - set(CLIENT_RCS ${CLIENT_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/pics.qrc PARENT_SCOPE) - # install(FILES qt-logo.png - # quassel-large.png - # DESTINATION ${DATA_INSTALL_DIR}/quassel/pics) - endif() +if (WANT_MONO OR WANT_QTCLIENT) + quassel_add_resource(Pics PREFIX pics PATTERNS + kde-vdg.png + quassel-64.svg + quassel-eye.png + quassel-logo.png + quassel-oxygen-32.png + qt-logo.png + qt-logo-32.png + ) endif() diff --git a/pics/pics.qrc b/pics/pics.qrc deleted file mode 100644 index 80bbbbb6..00000000 --- a/pics/pics.qrc +++ /dev/null @@ -1,11 +0,0 @@ - - - kde-vdg.png - quassel-64.svg - quassel-eye.png - quassel-logo.png - quassel-oxygen-32.png - qt-logo.png - qt-logo-32.png - - diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 1d95aa62..196e13d8 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -62,9 +62,10 @@ file(APPEND ${resfile} "\n\n") set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${qm_files};i18n.qrc") if(EMBED_DATA) - set(COMMON_RCS ${COMMON_RCS} ${resfile} PARENT_SCOPE) + quassel_add_module(Resource::I18n) + target_sources(${TARGET} PRIVATE ${resfile}) + add_custom_target(po DEPENDS ${qm_files}) + add_dependencies(${TARGET} po) else() - install(FILES ${qm_files} DESTINATION ${CMAKE_INSTALL_DATADIR}/quassel/translations) + install(FILES ${qm_files} DESTINATION ${CMAKE_INSTALL_DATADIR}/quassel/translations) endif() - -add_custom_target(po DEPENDS ${qm_files}) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index f23c62c4..6f4f6690 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -33,8 +33,6 @@ target_sources(${TARGET} PRIVATE # needed for automoc abstractui.h - - ${CLIENT_RCS} ) target_link_libraries(${TARGET} @@ -45,3 +43,5 @@ target_link_libraries(${TARGET} Qt5::Widgets # QAbstractItemView in BufferModel Quassel::Common ) + +target_link_if_exists(${TARGET} PUBLIC Quassel::Resource::Data) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index ebc626f3..f5bb920d 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -56,8 +56,6 @@ target_sources(${TARGET} PRIVATE # needed for automoc irccap.h protocol.h - - ${COMMON_RCS} ) # Needed for finding the generated version.h @@ -91,6 +89,4 @@ if (APPLE) target_link_libraries(${TARGET} PUBLIC "-framework CoreServices" "-framework CoreFoundation") endif() -# This is needed so translations are generated before trying to build the qrc. -# Should probably find a nicer solution with proper dependencies between the involved files, though... -add_dependencies(${TARGET} po) +target_link_if_exists(${TARGET} PUBLIC Quassel::Resource::I18n) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index ef0f7c0a..5316d586 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -42,9 +42,6 @@ target_sources(${TARGET} PRIVATE # needed for automoc coreeventmanager.h - - # Resources - sql.qrc ) if (HAVE_SSL) @@ -75,3 +72,6 @@ target_link_libraries(${TARGET} Qt5::Sql Quassel::Common ) + +quassel_add_resource(Sql PATTERNS SQL/*.sql) +target_link_libraries(${TARGET} PUBLIC Quassel::Resource::Sql) diff --git a/src/core/sql.qrc b/src/core/sql.qrc deleted file mode 100644 index 381abfe8..00000000 --- a/src/core/sql.qrc +++ /dev/null @@ -1,350 +0,0 @@ - - - ./SQL/PostgreSQL/delete_backlog_by_uid.sql - ./SQL/PostgreSQL/delete_backlog_for_buffer.sql - ./SQL/PostgreSQL/delete_backlog_for_network.sql - ./SQL/PostgreSQL/delete_buffer_for_bufferid.sql - ./SQL/PostgreSQL/delete_buffers_by_uid.sql - ./SQL/PostgreSQL/delete_buffers_for_network.sql - ./SQL/PostgreSQL/delete_identity.sql - ./SQL/PostgreSQL/delete_ircservers_for_network.sql - ./SQL/PostgreSQL/delete_network.sql - ./SQL/PostgreSQL/delete_networks_by_uid.sql - ./SQL/PostgreSQL/delete_nicks.sql - ./SQL/PostgreSQL/delete_quasseluser.sql - ./SQL/PostgreSQL/insert_buffer.sql - ./SQL/PostgreSQL/insert_core_state.sql - ./SQL/PostgreSQL/insert_identity.sql - ./SQL/PostgreSQL/insert_message.sql - ./SQL/PostgreSQL/insert_network.sql - ./SQL/PostgreSQL/insert_nick.sql - ./SQL/PostgreSQL/insert_quasseluser.sql - ./SQL/PostgreSQL/insert_sender.sql - ./SQL/PostgreSQL/insert_server.sql - ./SQL/PostgreSQL/insert_user_setting.sql - ./SQL/PostgreSQL/migrate_write_backlog.sql - ./SQL/PostgreSQL/migrate_write_buffer.sql - ./SQL/PostgreSQL/migrate_write_corestate.sql - ./SQL/PostgreSQL/migrate_write_identity.sql - ./SQL/PostgreSQL/migrate_write_identity_nick.sql - ./SQL/PostgreSQL/migrate_write_ircserver.sql - ./SQL/PostgreSQL/migrate_write_network.sql - ./SQL/PostgreSQL/migrate_write_quasseluser.sql - ./SQL/PostgreSQL/migrate_write_sender.sql - ./SQL/PostgreSQL/migrate_write_usersetting.sql - ./SQL/PostgreSQL/select_all_authusernames.sql - ./SQL/PostgreSQL/select_authenticator.sql - ./SQL/PostgreSQL/select_authuser.sql - ./SQL/PostgreSQL/select_bufferByName.sql - ./SQL/PostgreSQL/select_bufferExists.sql - ./SQL/PostgreSQL/select_buffer_bufferactivities.sql - ./SQL/PostgreSQL/select_buffer_bufferactivity.sql - ./SQL/PostgreSQL/select_buffer_by_id.sql - ./SQL/PostgreSQL/select_buffer_ciphers.sql - ./SQL/PostgreSQL/select_buffer_highlightcount.sql - ./SQL/PostgreSQL/select_buffer_highlightcounts.sql - ./SQL/PostgreSQL/select_buffer_lastseen_messages.sql - ./SQL/PostgreSQL/select_buffer_markerlinemsgids.sql - ./SQL/PostgreSQL/select_buffers.sql - ./SQL/PostgreSQL/select_buffers_for_network.sql - ./SQL/PostgreSQL/select_checkidentity.sql - ./SQL/PostgreSQL/select_connected_networks.sql - ./SQL/PostgreSQL/select_core_state.sql - ./SQL/PostgreSQL/select_identities.sql - ./SQL/PostgreSQL/select_internaluser.sql - ./SQL/PostgreSQL/select_messagesAll.sql - ./SQL/PostgreSQL/select_messagesAllNew.sql - ./SQL/PostgreSQL/select_messagesAllNew_filtered.sql - ./SQL/PostgreSQL/select_messagesAll_filtered.sql - ./SQL/PostgreSQL/select_messagesNewerThan.sql - ./SQL/PostgreSQL/select_messagesNewerThan_filtered.sql - ./SQL/PostgreSQL/select_messagesNewestK.sql - ./SQL/PostgreSQL/select_messagesNewestK_filtered.sql - ./SQL/PostgreSQL/select_messagesRange.sql - ./SQL/PostgreSQL/select_messagesRange_filtered.sql - ./SQL/PostgreSQL/select_networkExists.sql - ./SQL/PostgreSQL/select_network_awaymsg.sql - ./SQL/PostgreSQL/select_network_usermode.sql - ./SQL/PostgreSQL/select_networks_for_user.sql - ./SQL/PostgreSQL/select_nicks.sql - ./SQL/PostgreSQL/select_persistent_channels.sql - ./SQL/PostgreSQL/select_senderid.sql - ./SQL/PostgreSQL/select_servers_for_network.sql - ./SQL/PostgreSQL/select_user_setting.sql - ./SQL/PostgreSQL/select_userid.sql - ./SQL/PostgreSQL/setup_000_quasseluser.sql - ./SQL/PostgreSQL/setup_010_sender.sql - ./SQL/PostgreSQL/setup_020_identity.sql - ./SQL/PostgreSQL/setup_030_identity_nick.sql - ./SQL/PostgreSQL/setup_040_network.sql - ./SQL/PostgreSQL/setup_050_buffer.sql - ./SQL/PostgreSQL/setup_060_backlog.sql - ./SQL/PostgreSQL/setup_061_add_function_backlog_lastmsgid_update.sql - ./SQL/PostgreSQL/setup_062_add_trigger_backlog_lastmsgid_update.sql - ./SQL/PostgreSQL/setup_070_coreinfo.sql - ./SQL/PostgreSQL/setup_080_ircservers.sql - ./SQL/PostgreSQL/setup_090_backlog_idx.sql - ./SQL/PostgreSQL/setup_100_user_setting.sql - ./SQL/PostgreSQL/setup_110_alter_sender_seq.sql - ./SQL/PostgreSQL/setup_120_alter_messageid_seq.sql - ./SQL/PostgreSQL/setup_130_function_lastmsgid.sql - ./SQL/PostgreSQL/setup_140_sender_idx.sql - ./SQL/PostgreSQL/setup_150_corestate.sql - ./SQL/PostgreSQL/update_backlog_bufferid.sql - ./SQL/PostgreSQL/update_buffer_bufferactivity.sql - ./SQL/PostgreSQL/update_buffer_cipher.sql - ./SQL/PostgreSQL/update_buffer_highlightcount.sql - ./SQL/PostgreSQL/update_buffer_lastseen.sql - ./SQL/PostgreSQL/update_buffer_markerlinemsgid.sql - ./SQL/PostgreSQL/update_buffer_name.sql - ./SQL/PostgreSQL/update_buffer_persistent_channel.sql - ./SQL/PostgreSQL/update_buffer_set_channel_key.sql - ./SQL/PostgreSQL/update_core_state.sql - ./SQL/PostgreSQL/update_identity.sql - ./SQL/PostgreSQL/update_network.sql - ./SQL/PostgreSQL/update_network_connected.sql - ./SQL/PostgreSQL/update_network_set_awaymsg.sql - ./SQL/PostgreSQL/update_network_set_usermode.sql - ./SQL/PostgreSQL/update_user_setting.sql - ./SQL/PostgreSQL/update_username.sql - ./SQL/PostgreSQL/update_userpassword.sql - ./SQL/PostgreSQL/version/15/upgrade_000_alter_buffer_add_markerlinemsgid.sql - ./SQL/PostgreSQL/version/16/upgrade_000_alter_network_add_sasl.sql - ./SQL/PostgreSQL/version/17/upgrade_000_alter_quasseluser_add_passwordversion.sql - ./SQL/PostgreSQL/version/18/upgrade_000_alter_ircserver_add_sslverify.sql - ./SQL/PostgreSQL/version/19/upgrade_000_alter_network_add_ratelimit_usecustom.sql - ./SQL/PostgreSQL/version/19/upgrade_001_alter_network_add_ratelimit_burstsize.sql - ./SQL/PostgreSQL/version/19/upgrade_002_alter_network_add_ratelimit_delay.sql - ./SQL/PostgreSQL/version/19/upgrade_003_alter_network_add_ratelimit_unlimited.sql - ./SQL/PostgreSQL/version/20/upgrade_000_alter_buffer_add_lastmsgid.sql - ./SQL/PostgreSQL/version/20/upgrade_001_add_function_populate_lastmsgid.sql - ./SQL/PostgreSQL/version/20/upgrade_002_run_function_populate_lastmsgid.sql - ./SQL/PostgreSQL/version/20/upgrade_003_correct_bad_lastseenmsgid.sql - ./SQL/PostgreSQL/version/20/upgrade_004_add_lastseenmsgid_constraint.sql - ./SQL/PostgreSQL/version/21/upgrade_000_add_function_backlog_lastmsgid_update.sql - ./SQL/PostgreSQL/version/21/upgrade_001_add_trigger_backlog_lastmsgid_update.sql - ./SQL/PostgreSQL/version/22/upgrade_000_alter_quasseluser_add_authenticator.sql - ./SQL/PostgreSQL/version/23/upgrade_000_create_senderprefixes.sql - ./SQL/PostgreSQL/version/24/upgrade_000_alter_buffer_add_bufferactivity.sql - ./SQL/PostgreSQL/version/25/upgrade_000_alter_buffer_add_cipher.sql - ./SQL/PostgreSQL/version/26/upgrade_000_alter_buffer_add_highlightcount.sql - ./SQL/PostgreSQL/version/27/upgrade_000_update_sender_add_realname.sql - ./SQL/PostgreSQL/version/27/upgrade_010_update_sender_add_avatarurl.sql - ./SQL/PostgreSQL/version/27/upgrade_020_update_sender_add_new_constraint.sql - ./SQL/PostgreSQL/version/27/upgrade_030_upgrade_sender_drop_old_constraint.sql - ./SQL/PostgreSQL/version/28/upgrade_000_create_corestate.sql - ./SQL/PostgreSQL/version/29/upgrade_010_alter_sender_64bit_ids.sql - ./SQL/PostgreSQL/version/29/upgrade_050_alter_buffer_64bit_ids.sql - ./SQL/PostgreSQL/version/29/upgrade_060_alter_backlog_64bit_ids.sql - ./SQL/SQLite/delete_backlog_by_uid.sql - ./SQL/SQLite/delete_backlog_for_buffer.sql - ./SQL/SQLite/delete_backlog_for_network.sql - ./SQL/SQLite/delete_buffer_for_bufferid.sql - ./SQL/SQLite/delete_buffers_by_uid.sql - ./SQL/SQLite/delete_buffers_for_network.sql - ./SQL/SQLite/delete_identity.sql - ./SQL/SQLite/delete_ircservers_for_network.sql - ./SQL/SQLite/delete_network.sql - ./SQL/SQLite/delete_networks_by_uid.sql - ./SQL/SQLite/delete_nicks.sql - ./SQL/SQLite/delete_quasseluser.sql - ./SQL/SQLite/insert_buffer.sql - ./SQL/SQLite/insert_core_state.sql - ./SQL/SQLite/insert_identity.sql - ./SQL/SQLite/insert_message.sql - ./SQL/SQLite/insert_network.sql - ./SQL/SQLite/insert_nick.sql - ./SQL/SQLite/insert_quasseluser.sql - ./SQL/SQLite/insert_sender.sql - ./SQL/SQLite/insert_server.sql - ./SQL/SQLite/insert_user_setting.sql - ./SQL/SQLite/migrate_read_backlog.sql - ./SQL/SQLite/migrate_read_buffer.sql - ./SQL/SQLite/migrate_read_corestate.sql - ./SQL/SQLite/migrate_read_identity.sql - ./SQL/SQLite/migrate_read_identity_nick.sql - ./SQL/SQLite/migrate_read_ircserver.sql - ./SQL/SQLite/migrate_read_network.sql - ./SQL/SQLite/migrate_read_quasseluser.sql - ./SQL/SQLite/migrate_read_sender.sql - ./SQL/SQLite/migrate_read_usersetting.sql - ./SQL/SQLite/select_all_authusernames.sql - ./SQL/SQLite/select_authenticator.sql - ./SQL/SQLite/select_authuser.sql - ./SQL/SQLite/select_bufferByName.sql - ./SQL/SQLite/select_bufferExists.sql - ./SQL/SQLite/select_buffer_bufferactivities.sql - ./SQL/SQLite/select_buffer_bufferactivity.sql - ./SQL/SQLite/select_buffer_by_id.sql - ./SQL/SQLite/select_buffer_ciphers.sql - ./SQL/SQLite/select_buffer_highlightcount.sql - ./SQL/SQLite/select_buffer_highlightcounts.sql - ./SQL/SQLite/select_buffer_lastseen_messages.sql - ./SQL/SQLite/select_buffer_markerlinemsgids.sql - ./SQL/SQLite/select_buffers.sql - ./SQL/SQLite/select_buffers_for_merge.sql - ./SQL/SQLite/select_buffers_for_network.sql - ./SQL/SQLite/select_checkidentity.sql - ./SQL/SQLite/select_connected_networks.sql - ./SQL/SQLite/select_core_state.sql - ./SQL/SQLite/select_identities.sql - ./SQL/SQLite/select_internaluser.sql - ./SQL/SQLite/select_messagesAll.sql - ./SQL/SQLite/select_messagesAllNew.sql - ./SQL/SQLite/select_messagesAllNew_filtered.sql - ./SQL/SQLite/select_messagesAll_filtered.sql - ./SQL/SQLite/select_messagesNewerThan.sql - ./SQL/SQLite/select_messagesNewerThan_filtered.sql - ./SQL/SQLite/select_messagesNewestK.sql - ./SQL/SQLite/select_messagesNewestK_filtered.sql - ./SQL/SQLite/select_messagesRange.sql - ./SQL/SQLite/select_messagesRange_filtered.sql - ./SQL/SQLite/select_networkExists.sql - ./SQL/SQLite/select_network_awaymsg.sql - ./SQL/SQLite/select_network_usermode.sql - ./SQL/SQLite/select_networks_for_user.sql - ./SQL/SQLite/select_nicks.sql - ./SQL/SQLite/select_persistent_channels.sql - ./SQL/SQLite/select_servers_for_network.sql - ./SQL/SQLite/select_user_setting.sql - ./SQL/SQLite/select_userid.sql - ./SQL/SQLite/setup_000_quasseluser.sql - ./SQL/SQLite/setup_010_sender.sql - ./SQL/SQLite/setup_020_network.sql - ./SQL/SQLite/setup_030_buffer.sql - ./SQL/SQLite/setup_040_buffer_idx.sql - ./SQL/SQLite/setup_050_buffer_cname_idx.sql - ./SQL/SQLite/setup_060_backlog.sql - ./SQL/SQLite/setup_061_add_trigger_backlog_lastmsgid_update_direct_insert.sql - ./SQL/SQLite/setup_062_add_trigger_backlog_lastmsgid_update_direct_update.sql - ./SQL/SQLite/setup_070_coreinfo.sql - ./SQL/SQLite/setup_080_ircservers.sql - ./SQL/SQLite/setup_090_backlog_idx.sql - ./SQL/SQLite/setup_100_backlog_idx2.sql - ./SQL/SQLite/setup_110_backlog_idx3.sql - ./SQL/SQLite/setup_110_buffer_user_idx.sql - ./SQL/SQLite/setup_120_user_setting.sql - ./SQL/SQLite/setup_130_identity.sql - ./SQL/SQLite/setup_140_identity_nick.sql - ./SQL/SQLite/setup_150_sender_idx.sql - ./SQL/SQLite/setup_160_corestate.sql - ./SQL/SQLite/update_backlog_bufferid.sql - ./SQL/SQLite/update_buffer_bufferactivity.sql - ./SQL/SQLite/update_buffer_cipher.sql - ./SQL/SQLite/update_buffer_highlightcount.sql - ./SQL/SQLite/update_buffer_lastseen.sql - ./SQL/SQLite/update_buffer_markerlinemsgid.sql - ./SQL/SQLite/update_buffer_name.sql - ./SQL/SQLite/update_buffer_persistent_channel.sql - ./SQL/SQLite/update_buffer_set_channel_key.sql - ./SQL/SQLite/update_core_state.sql - ./SQL/SQLite/update_identity.sql - ./SQL/SQLite/update_network.sql - ./SQL/SQLite/update_network_connected.sql - ./SQL/SQLite/update_network_set_awaymsg.sql - ./SQL/SQLite/update_network_set_usermode.sql - ./SQL/SQLite/update_user_setting.sql - ./SQL/SQLite/update_username.sql - ./SQL/SQLite/update_userpassword.sql - ./SQL/SQLite/version/1/upgrade_000_drop_coreinfo.sql - ./SQL/SQLite/version/1/upgrade_010_create_coreinfo.sql - ./SQL/SQLite/version/1/upgrade_020_update_schemaversion.sql - ./SQL/SQLite/version/2/upgrade_000_drop_buffergroup.sql - ./SQL/SQLite/version/2/upgrade_010_update_schemaversion.sql - ./SQL/SQLite/version/3/upgrade_000_update_backlog_flags.sql - ./SQL/SQLite/version/3/upgrade_010_update_schemaversion.sql - ./SQL/SQLite/version/4/upgrade_000_rename_buffertable.sql - ./SQL/SQLite/version/4/upgrade_010_create_buffertable.sql - ./SQL/SQLite/version/4/upgrade_020_copy_buffertable.sql - ./SQL/SQLite/version/4/upgrade_030_drop_oldbuffertable.sql - ./SQL/SQLite/version/4/upgrade_040_create_buffer_idx.sql - ./SQL/SQLite/version/4/upgrade_050_create_buffer_cname_idx.sql - ./SQL/SQLite/version/5/upgrade_000_rename_networktable.sql - ./SQL/SQLite/version/5/upgrade_010_create_newnetworktable.sql - ./SQL/SQLite/version/5/upgrade_020_copy_networktable.sql - ./SQL/SQLite/version/5/upgrade_030_drop_oldnetworktable.sql - ./SQL/SQLite/version/5/upgrade_180_create_ircservers.sql - ./SQL/SQLite/version/6/upgrade_000_alter_buffertable.sql - ./SQL/SQLite/version/6/upgrade_010_set_statusbuffertype.sql - ./SQL/SQLite/version/6/upgrade_020_set_channelbuffertype.sql - ./SQL/SQLite/version/6/upgrade_030_set_querybuffertype.sql - ./SQL/SQLite/version/6/upgrade_040_update_msgtype.sql - ./SQL/SQLite/version/6/upgrade_050_update_msgtype.sql - ./SQL/SQLite/version/6/upgrade_060_update_msgtype.sql - ./SQL/SQLite/version/6/upgrade_070_update_msgtype.sql - ./SQL/SQLite/version/6/upgrade_080_update_msgtype.sql - ./SQL/SQLite/version/6/upgrade_090_update_msgtype.sql - ./SQL/SQLite/version/6/upgrade_100_update_msgtype.sql - ./SQL/SQLite/version/6/upgrade_110_update_msgtype.sql - ./SQL/SQLite/version/6/upgrade_120_update_msgtype.sql - ./SQL/SQLite/version/6/upgrade_130_update_msgtype.sql - ./SQL/SQLite/version/6/upgrade_140_update_msgtype.sql - ./SQL/SQLite/version/6/upgrade_150_update_msgtype.sql - ./SQL/SQLite/version/6/upgrade_160_update_msgtype.sql - ./SQL/SQLite/version/7/upgrade_000_rename_networktable.sql - ./SQL/SQLite/version/7/upgrade_010_create_newnetworktable.sql - ./SQL/SQLite/version/7/upgrade_020_copy_networktable.sql - ./SQL/SQLite/version/7/upgrade_030_drop_oldnetworktable.sql - ./SQL/SQLite/version/7/upgrade_040_alter_buffer_add_lastseen.sql - ./SQL/SQLite/version/8/upgrade_000_alter_network_add_connected.sql - ./SQL/SQLite/version/8/upgrade_010_alter_buffer_add_key.sql - ./SQL/SQLite/version/8/upgrade_020_alter_buffer_add_joined.sql - ./SQL/SQLite/version/8/upgrade_030_update_buffer_set_joined_for_channels.sql - ./SQL/SQLite/version/9/upgrade_000_create_backlog_idx.sql - ./SQL/SQLite/version/9/upgrade_010_create_backlog_idx2.sql - ./SQL/SQLite/version/9/upgrade_020_create_buffer_idx.sql - ./SQL/SQLite/version/10/upgrade_000_switch_to_msgid.sql - ./SQL/SQLite/version/10/upgrade_010_rename_buffer_table.sql - ./SQL/SQLite/version/10/upgrade_020_create_buffer_table.sql - ./SQL/SQLite/version/10/upgrade_030_copy_buffer_table.sql - ./SQL/SQLite/version/10/upgrade_040_drop_buffer_old_table.sql - ./SQL/SQLite/version/11/upgrade_000_create_user_setting.sql - ./SQL/SQLite/version/12/upgrade_000_create_identity.sql - ./SQL/SQLite/version/12/upgrade_010_create_identity_nick.sql - ./SQL/SQLite/version/12/upgrade_020_rename_servertable.sql - ./SQL/SQLite/version/12/upgrade_030_create_ircserver.sql - ./SQL/SQLite/version/12/upgrade_040_copy_ircserver.sql - ./SQL/SQLite/version/12/upgrade_050_drop_ircserverold.sql - ./SQL/SQLite/version/13/upgrade_000_create_buffer_user_idx.sql - ./SQL/SQLite/version/13/upgrade_010_create_buffer_cname_idx.sql - ./SQL/SQLite/version/13/upgrade_020_create_buffer_cname_idx.sql - ./SQL/SQLite/version/14/upgrade_000_rename_networktable.sql - ./SQL/SQLite/version/14/upgrade_010_create_networktable.sql - ./SQL/SQLite/version/14/upgrade_030_copy_networktable.sql - ./SQL/SQLite/version/14/upgrade_040_drop_networkold.sql - ./SQL/SQLite/version/15/upgrade_000_fix_ircservers.sql - ./SQL/SQLite/version/15/upgrade_000_fix_network.sql - ./SQL/SQLite/version/16/upgrade_000_alter_buffer_add_markerlinemsgid.sql - ./SQL/SQLite/version/17/upgrade_000_alter_network_add_sasl.sql - ./SQL/SQLite/version/17/upgrade_001_alter_network_add_sasl.sql - ./SQL/SQLite/version/17/upgrade_002_alter_network_add_sasl.sql - ./SQL/SQLite/version/18/upgrade_000_alter_quasseluser_add_passwordversion.sql - ./SQL/SQLite/version/19/upgrade_000_alter_ircserver_add_sslverify.sql - ./SQL/SQLite/version/20/upgrade_000_alter_network_add_ratelimit_usecustom.sql - ./SQL/SQLite/version/20/upgrade_001_alter_network_add_ratelimit_burstsize.sql - ./SQL/SQLite/version/20/upgrade_002_alter_network_add_ratelimit_delay.sql - ./SQL/SQLite/version/20/upgrade_003_alter_network_add_ratelimit_unlimited.sql - ./SQL/SQLite/version/21/upgrade_000_alter_buffer_add_lastmsgid.sql - ./SQL/SQLite/version/21/upgrade_001_update_buffer_set_lastmsgid.sql - ./SQL/SQLite/version/21/upgrade_002_update_buffer_fix_lastseenmsgid_over_lastmsgid.sql - ./SQL/SQLite/version/21/upgrade_003_create_table_buffer_new.sql - ./SQL/SQLite/version/21/upgrade_004_insert_into_buffer_new_from_buffer.sql - ./SQL/SQLite/version/21/upgrade_005_drop_table_buffer.sql - ./SQL/SQLite/version/21/upgrade_006_alter_table_buffer_new_rename_to_buffer.sql - ./SQL/SQLite/version/22/upgrade_000_add_trigger_backlog_lastmsgid_update_direct_insert.sql - ./SQL/SQLite/version/22/upgrade_001_add_trigger_backlog_lastmsgid_update_direct_update.sql - ./SQL/SQLite/version/23/upgrade_000_alter_quasseluser_add_authenticator.sql - ./SQL/SQLite/version/24/upgrade_000_create_senderprefixes.sql - ./SQL/SQLite/version/25/upgrade_000_alter_buffer_add_bufferactivity.sql - ./SQL/SQLite/version/26/upgrade_000_create_buffer_idx.sql - ./SQL/SQLite/version/27/upgrade_000_alter_buffer_add_cipher.sql - ./SQL/SQLite/version/28/upgrade_000_alter_buffer_add_highlightcount.sql - ./SQL/SQLite/version/29/upgrade_000_create_sender_tmp.sql - ./SQL/SQLite/version/29/upgrade_010_copy_sender_sender_tmp.sql - ./SQL/SQLite/version/29/upgrade_020_drop_sender.sql - ./SQL/SQLite/version/29/upgrade_030_rename_sender_tmp_sender.sql - ./SQL/SQLite/version/29/upgrade_040_update_sender_add_realname_avatarurl.sql - ./SQL/SQLite/version/30/upgrade_000_create_corestate.sql - ./SQL/SQLite/version/31/upgrade_000_update_buffer_set_time_extended.sql - - diff --git a/src/main/main.cpp b/src/main/main.cpp index c8185b03..1cd6ba91 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -70,17 +70,9 @@ int main(int argc, char **argv) Q_INIT_RESOURCE(i18n); # ifndef BUILD_CORE Q_INIT_RESOURCE(data); - Q_INIT_RESOURCE(breeze_icons); - Q_INIT_RESOURCE(breeze_dark_icons); -# ifdef WITH_OXYGEN_ICONS - Q_INIT_RESOURCE(oxygen_icons); -# endif + Q_INIT_RESOURCE(icons); # ifdef WITH_BUNDLED_ICONS - Q_INIT_RESOURCE(breeze_icon_theme); - Q_INIT_RESOURCE(breeze_dark_icon_theme); -# ifdef WITH_OXYGEN_ICONS - Q_INIT_RESOURCE(oxygen_icon_theme); -# endif + Q_INIT_RESOURCE(iconthemes); # endif # endif #endif diff --git a/src/uisupport/CMakeLists.txt b/src/uisupport/CMakeLists.txt index 345c4d17..44fda179 100644 --- a/src/uisupport/CMakeLists.txt +++ b/src/uisupport/CMakeLists.txt @@ -60,3 +60,11 @@ if (KF5Sonnet_FOUND) target_link_libraries(${TARGET} PRIVATE KF5::SonnetUi) target_compile_definitions(${TARGET} PRIVATE -DHAVE_SONNET) endif() + +target_link_if_exists(${TARGET} + PUBLIC + Quassel::Resource::HicolorIcons + Quassel::Resource::Icons + Quassel::Resource::IconThemes + Quassel::Resource::Pics +)