diff options
| author | Antonio Rojas <[email protected]> | 2019-12-09 23:23:07 +0100 |
|---|---|---|
| committer | Antonio Rojas <[email protected]> | 2019-12-09 23:23:07 +0100 |
| commit | 8ffc72e87f4cffa8dce32da06e9a1d51a595765e (patch) | |
| tree | 0b29393fd4710ed536de903e394ce1a955fe016a | |
| parent | 9c7e196bddd692032245c8f068495f318434169d (diff) | |
| parent | 588965feccdc38c8bf2ec0e1a25b8d195c451062 (diff) | |
Merge branch 'release/19.12'
| -rw-r--r-- | src/global.h | 1 | ||||
| -rw-r--r-- | src/kitemviews/kstandarditem.h | 1 | ||||
| -rw-r--r-- | src/search/dolphinsearchbox.cpp | 2 | ||||
| -rw-r--r-- | src/settings/dolphinsettingsdialog.cpp | 1 | ||||
| -rw-r--r-- | src/settings/general/previewssettingspage.cpp | 1 | ||||
| -rw-r--r-- | src/settings/services/servicessettingspage.cpp | 1 | ||||
| -rw-r--r-- | src/views/draganddrophelper.cpp | 1 |
7 files changed, 8 insertions, 0 deletions
diff --git a/src/global.h b/src/global.h index d1a3f4f52..f203615f1 100644 --- a/src/global.h +++ b/src/global.h @@ -22,6 +22,7 @@ #include <QList> #include <QUrl> +#include <QWidget> namespace Dolphin { QList<QUrl> validateUris(const QStringList& uriList); diff --git a/src/kitemviews/kstandarditem.h b/src/kitemviews/kstandarditem.h index ad3452d77..13e61a089 100644 --- a/src/kitemviews/kstandarditem.h +++ b/src/kitemviews/kstandarditem.h @@ -25,6 +25,7 @@ #include <QByteArray> #include <QHash> #include <QObject> +#include <QSet> #include <QVariant> class KStandardItemModel; diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index ee7cbe628..16f17bbcd 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -39,9 +39,11 @@ #include <QFontDatabase> #include <QHBoxLayout> #include <QIcon> +#include <QKeyEvent> #include <QLabel> #include <QLineEdit> #include <QScrollArea> +#include <QShowEvent> #include <QTimer> #include <QToolButton> #include <QUrlQuery> diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index 01cfd9f86..87bc95a7f 100644 --- a/src/settings/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -34,6 +34,7 @@ #include <KWindowConfig> #include <KMessageBox> +#include <QCloseEvent> #include <QPushButton> DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) : diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp index 30d71ff54..90a4211c0 100644 --- a/src/settings/general/previewssettingspage.cpp +++ b/src/settings/general/previewssettingspage.cpp @@ -32,6 +32,7 @@ #include <QLabel> #include <QListView> #include <QPainter> +#include <QShowEvent> #include <QSortFilterProxyModel> #include <QSpinBox> diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp index 83672b556..1f8310dfc 100644 --- a/src/settings/services/servicessettingspage.cpp +++ b/src/settings/services/servicessettingspage.cpp @@ -36,6 +36,7 @@ #include <QGridLayout> #include <QLabel> #include <QListWidget> +#include <QShowEvent> #include <QSortFilterProxyModel> namespace diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp index d437b877e..d248d00eb 100644 --- a/src/views/draganddrophelper.cpp +++ b/src/views/draganddrophelper.cpp @@ -25,6 +25,7 @@ #include <QDBusConnection> #include <QDBusMessage> +#include <QDropEvent> #include <QMimeData> QHash<QUrl, bool> DragAndDropHelper::m_urlListMatchesUrlCache; |