mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Merge branch 'Applications/18.04'
This commit is contained in:
commit
c9acf79152
|
@ -11,7 +11,6 @@ add_definitions(
|
||||||
)
|
)
|
||||||
remove_definitions(
|
remove_definitions(
|
||||||
-DQT_NO_CAST_FROM_BYTEARRAY
|
-DQT_NO_CAST_FROM_BYTEARRAY
|
||||||
-DQT_NO_URL_CAST_FROM_STRING
|
|
||||||
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
|
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
|
||||||
-DQT_NO_CAST_FROM_ASCII
|
-DQT_NO_CAST_FROM_ASCII
|
||||||
-DQT_NO_CAST_TO_ASCII
|
-DQT_NO_CAST_TO_ASCII
|
||||||
|
|
|
@ -42,7 +42,7 @@ Trash::Trash()
|
||||||
};
|
};
|
||||||
connect(m_trashDirLister, static_cast<void(KDirLister::*)()>(&KDirLister::completed), this, trashDirContentChanged);
|
connect(m_trashDirLister, static_cast<void(KDirLister::*)()>(&KDirLister::completed), this, trashDirContentChanged);
|
||||||
connect(m_trashDirLister, &KDirLister::itemsDeleted, this, trashDirContentChanged);
|
connect(m_trashDirLister, &KDirLister::itemsDeleted, this, trashDirContentChanged);
|
||||||
m_trashDirLister->openUrl(QStringLiteral("trash:/"));
|
m_trashDirLister->openUrl(QUrl(QStringLiteral("trash:/")));
|
||||||
}
|
}
|
||||||
|
|
||||||
Trash::~Trash()
|
Trash::~Trash()
|
||||||
|
|
Loading…
Reference in a new issue