tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure we're not automatically casting QString directly into QUrl

Browse source 
Otherwise we often turn paths into URLs, a fix I pushed previously today
and the ones I detected when adding -DQT_NO_URL_CAST_FROM_STRING.

CCMAIL: kdeconnect@kde.org
This commit is contained in:
Aleix Pol 2015-04-01 23:40:29 +02:00
parent 9ab7e2356e
commit 90f5a221fb
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -28,6 +28,8 @@ include(FeatureSummary)
include(KDEConnectMacros.cmake) include(KDEConnectMacros.cmake)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
include(GenerateExportHeader) include(GenerateExportHeader)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})

4
plugins/share/share_config.cpp
View file

@ -46,7 +46,7 @@ void ShareConfig::defaults()
{ {
KCModule::defaults(); KCModule::defaults();
m_ui->kurlrequester->setUrl(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)); m_ui->kurlrequester->setUrl(QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)));
Q_EMIT changed(true); Q_EMIT changed(true);
} }
@ -55,7 +55,7 @@ void ShareConfig::load()
{ {
KCModule::load(); KCModule::load();
m_ui->kurlrequester->setUrl(config()->get("incoming_path", QStandardPaths::writableLocation(QStandardPaths::DownloadLocation))); m_ui->kurlrequester->setUrl(config()->get("incoming_path", QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation))));
Q_EMIT changed(false); Q_EMIT changed(false);
} }