From f536d396f958e69b200a011034f1ff1ff2fdef7d Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 19 Mar 2018 23:35:33 +0100 Subject: [PATCH 1/2] GIT_SILENT Upgrade KDE Applications version to 18.03.80. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37be9d5d5c..5b133dcd05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "18") set (KDE_APPLICATIONS_VERSION_MINOR "03") -set (KDE_APPLICATIONS_VERSION_MICRO "70") +set (KDE_APPLICATIONS_VERSION_MICRO "80") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION}) From 1da0983c42a1ccd8034d411b87694753b5f9e9e6 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 21 Mar 2018 15:30:51 +0100 Subject: [PATCH 2/2] Fix compilation with -DQT_NO_URL_CAST_FROM_STRING --- src/CMakeLists.txt | 1 - src/trash/dolphintrash.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7b70370035..263b3ff0cb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,7 +11,6 @@ add_definitions( ) remove_definitions( -DQT_NO_CAST_FROM_BYTEARRAY - -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII diff --git a/src/trash/dolphintrash.cpp b/src/trash/dolphintrash.cpp index 8157094401..749d0d4811 100644 --- a/src/trash/dolphintrash.cpp +++ b/src/trash/dolphintrash.cpp @@ -42,7 +42,7 @@ Trash::Trash() }; connect(m_trashDirLister, static_cast(&KDirLister::completed), this, trashDirContentChanged); connect(m_trashDirLister, &KDirLister::itemsDeleted, this, trashDirContentChanged); - m_trashDirLister->openUrl(QStringLiteral("trash:/")); + m_trashDirLister->openUrl(QUrl(QStringLiteral("trash:/"))); } Trash::~Trash()