]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Fix compilation with -DQT_NO_URL_CAST_FROM_STRING
authorDavid Faure <faure@kde.org>
Wed, 21 Mar 2018 14:30:51 +0000 (15:30 +0100)
committerDavid Faure <faure@kde.org>
Wed, 21 Mar 2018 14:30:51 +0000 (15:30 +0100)
src/CMakeLists.txt
src/trash/dolphintrash.cpp

index 7b703700357e3e370b11cc1cf6f4cbf01a482612..263b3ff0cb8872e9cfc62ae6c52dde3c2f24766b 100644 (file)
@@ -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
index 8157094401ee4ba24cd0178de21de7a997885497..749d0d48111318374a4b35bc703c29876ed7c9b9 100644 (file)
@@ -42,7 +42,7 @@ Trash::Trash()
     };
     connect(m_trashDirLister, static_cast<void(KDirLister::*)()>(&KDirLister::completed), this, trashDirContentChanged);
     connect(m_trashDirLister, &KDirLister::itemsDeleted, this, trashDirContentChanged);
-    m_trashDirLister->openUrl(QStringLiteral("trash:/"));
+    m_trashDirLister->openUrl(QUrl(QStringLiteral("trash:/")));
 }
 
 Trash::~Trash()