Use ENABLE_QT_RESOURCES_OF_STATIC_DEPENDENCIES
This commit is contained in:
parent
7ec7528173
commit
924241f65c
|
@ -9,7 +9,7 @@ set(META_APP_DESCRIPTION "Tray application for Syncthing")
|
|||
set(META_APP_CATEGORIES "System;Utility;Network;FileTransfer")
|
||||
set(META_VERSION_MAJOR 0)
|
||||
set(META_VERSION_MINOR 4)
|
||||
set(META_VERSION_PATCH 1)
|
||||
set(META_VERSION_PATCH 2)
|
||||
set(META_VERSION_EXACT_SONAME ON)
|
||||
|
||||
project(${META_PROJECT_NAME})
|
||||
|
|
|
@ -109,7 +109,7 @@ set(REQUIRED_ICONS
|
|||
#set(FALLBACK_ICON_THEME breeze)
|
||||
|
||||
# find c++utilities
|
||||
find_package(c++utilities 4.2.0 REQUIRED)
|
||||
find_package(c++utilities 4.6.0 REQUIRED)
|
||||
use_cpp_utilities()
|
||||
|
||||
# find qtutilities
|
||||
|
|
|
@ -32,6 +32,8 @@ using namespace ApplicationUtilities;
|
|||
using namespace QtGui;
|
||||
using namespace Data;
|
||||
|
||||
ENABLE_QT_RESOURCES_OF_STATIC_DEPENDENCIES
|
||||
|
||||
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
||||
void handleSystemdServiceError(const QString &context, const QString &name, const QString &message)
|
||||
{
|
||||
|
@ -141,11 +143,7 @@ int runApplication(int argc, const char *const *argv)
|
|||
Settings::restore();
|
||||
Settings::values().qt.apply();
|
||||
qtConfigArgs.applySettings(true);
|
||||
|
||||
LOAD_QT_TRANSLATIONS;
|
||||
TranslationFiles::loadApplicationTranslationFile(QStringLiteral("syncthingconnection"));
|
||||
TranslationFiles::loadApplicationTranslationFile(QStringLiteral("syncthingmodel"));
|
||||
QtUtilitiesResources::init();
|
||||
|
||||
int res = initSyncthingTray(windowedArg.isPresent(), waitForTrayArg.isPresent());
|
||||
if(!res) {
|
||||
|
@ -154,7 +152,6 @@ int runApplication(int argc, const char *const *argv)
|
|||
}
|
||||
|
||||
Settings::save();
|
||||
QtUtilitiesResources::cleanup();
|
||||
return res;
|
||||
} else {
|
||||
if(!TrayWidget::instances().empty() && (showWebUiArg.isPresent() || triggerArg.isPresent())) {
|
||||
|
|
Loading…
Reference in New Issue