Commit 01819388 authored by David Faure's avatar David Faure

add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + fix compilation

parent ac8ebbd2
......@@ -107,6 +107,7 @@ configure_file(config-gwenview.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gwenvi
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_definitions(-DTRANSLATION_DOMAIN="gwenview")
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
## dirs to build
add_subdirectory(lib)
......
......@@ -232,8 +232,7 @@ FolderViewContextManagerItem::~FolderViewContextManagerItem()
void FolderViewContextManagerItem::slotCurrentDirUrlChanged(const QUrl &url)
{
if (url.isValid() && d->mUrlToSelect != url) {
d->mUrlToSelect = QDir::cleanPath(url.path());
d->mUrlToSelect = d->mUrlToSelect.adjusted(QUrl::StripTrailingSlash);
d->mUrlToSelect = url.adjusted(QUrl::StripTrailingSlash | QUrl::NormalizePathSegments);
d->mExpandingIndex = QModelIndex();
}
if (!d->mView->isVisible()) {
......
......@@ -38,9 +38,9 @@ QUrl setUpRemoteTestDir(const QString& testFile)
return QUrl();
}
QUrl baseUrl = QString::fromLocal8Bit(qgetenv("GV_REMOTE_TESTS_BASE_URL"));
QUrl baseUrl(QString::fromLocal8Bit(qgetenv("GV_REMOTE_TESTS_BASE_URL")));
baseUrl = baseUrl.adjusted(QUrl::StripTrailingSlash);
baseUrl.setPath(baseUrl.path() + '/' + "gwenview-remote-tests");
baseUrl.setPath(baseUrl.path() + "/gwenview-remote-tests");
if (KIO::NetAccess::exists(baseUrl, KIO::NetAccess::DestinationSide, authWindow)) {
KIO::NetAccess::del(baseUrl, authWindow);
......
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