kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/18.04'

Browse source
This commit is contained in:
David Faure 2018-03-21 15:34:36 +01:00
parent ffec5f17d3 1da0983c42
commit c9acf79152
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/CMakeLists.txt
View 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

2
src/trash/dolphintrash.cpp
View 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()