diff options
| author | Martin Negyokru <negyokru@inf.u-szeged.hu> | 2022-06-07 14:52:39 +0200 |
|---|---|---|
| committer | Martin Negyokru <negyokru@inf.u-szeged.hu> | 2023-02-01 17:10:14 +0100 |
| commit | 459b93b12c6d896ac1ff85ebe143b3176e3c4ffc (patch) | |
| tree | 1090c9ec812a3e49624fa9501d45d6aed37feb57 /src/webenginequick/ui_delegates_manager.cpp | |
| parent | a4cebe374b59f2e30074deac625529820d475130 (diff) | |
| download | qtwebengine-459b93b12c6d896ac1ff85ebe143b3176e3c4ffc.tar.gz | |
Replace custom ColorDialog with QtQuick ColorDialog
Add fallback to custom implementation.
Add subdirectories of ControlsDelegates to import path.
Change-Id: I88224b267419664484cd0667456d9463d5c61bee
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/webenginequick/ui_delegates_manager.cpp')
| -rw-r--r-- | src/webenginequick/ui_delegates_manager.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/webenginequick/ui_delegates_manager.cpp b/src/webenginequick/ui_delegates_manager.cpp index b4036c5ee..3d6eff649 100644 --- a/src/webenginequick/ui_delegates_manager.cpp +++ b/src/webenginequick/ui_delegates_manager.cpp @@ -14,6 +14,7 @@ #include <touch_selection_menu_controller.h> #include <web_contents_adapter_client.h> +#include <QtCore/qdiriterator.h> #include <QtCore/qfileinfo.h> #include <QtCore/qlist.h> #include <QtCore/qtimer.h> @@ -731,8 +732,14 @@ bool UIDelegatesManager::initializeImportDirs(QStringList &dirs, QQmlEngine *eng } QFileInfo fi(controlsImportPath); - if (fi.exists()) + if (fi.exists()) { dirs << fi.absolutePath(); + + // add subdirectories + QDirIterator it(controlsImportPath, QDir::AllDirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories); + while (it.hasNext()) + dirs << QFileInfo(it.next()).absoluteFilePath(); + } } return !dirs.isEmpty(); } |