Commit 396b833b authored by Luca Giambonini's avatar Luca Giambonini

align with the KF5 definitions, removed the QString cast for now, to many troubles.

parent 559811ea
......@@ -3,6 +3,16 @@ project(akabei)
cmake_minimum_required(VERSION 3.0.0)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
# KF5 global definitions, use them to be compatible with KF5 applications
add_definitions(#-DQT_NO_CAST_TO_ASCII
#-DQT_NO_CAST_FROM_ASCII
-DQT_NO_URL_CAST_FROM_STRING
-DQT_NO_CAST_FROM_BYTEARRAY
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
-DQT_USE_FAST_OPERATOR_PLUS
-DQT_USE_QSTRINGBUILDER
)
set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/akabei" CACHE "Akabei data's install dir" STRING)
set(SCRIPTS_INSTALL_DIR "${DATA_INSTALL_DIR}/python" CACHE "Akabei scripts' install dir" STRING)
set(LOCALE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/locale" CACHE "Akabei locales' install dir" STRING)
......
......@@ -58,7 +58,7 @@ OperationManager::OperationManager(APM::OperationType type, QList<APM::Operation
QLocale systemLocale = QLocale::system();
AkabeiClient::Backend::instance()->setLocale( systemLocale.name() );
AkabeiClient::Backend::instance()->initialize(root, cache, dbs, config);
AkabeiClient::Backend::instance()->initialize(root, cache, dbs, QUrl(config));
}
OperationManager::~OperationManager()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment