summaryrefslogtreecommitdiffstats
path: root/src/webengine/ui_delegates_manager.cpp
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@theqtcompany.com>2016-07-06 13:55:31 +0200
committerMichal Klocek <michal.klocek@qt.io>2016-10-04 11:50:43 +0000
commit33348994de656361942456834ac0c719ff5d87b8 (patch)
treebe9dd0c863d7a87575183d7484f5fad9cc830e4c /src/webengine/ui_delegates_manager.cpp
parent7f763e5fd0ba5481040d08f97034fec0dac61236 (diff)
Clean up qt quick controls 1 dialogs
Based on code review for qqc2 integration, apply cleanup changes to qqc1. Change-Id: I9752ce944385a529a1d999a5419638868e18d799 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/webengine/ui_delegates_manager.cpp')
-rw-r--r--src/webengine/ui_delegates_manager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp
index 4ca4ba98c..6896b850d 100644
--- a/src/webengine/ui_delegates_manager.cpp
+++ b/src/webengine/ui_delegates_manager.cpp
@@ -145,7 +145,7 @@ UIDelegatesManager::~UIDelegatesManager()
bool UIDelegatesManager::initializeImportDirs(QStringList &dirs, QQmlEngine *engine) {
foreach (const QString &path, engine->importPathList()) {
- QFileInfo fi(path % QLatin1String("/QtWebEngine/UIDelegates/"));
+ QFileInfo fi(path % QLatin1String("/QtWebEngine/Controls1Delegates/"));
if (fi.exists()) {
dirs << fi.absolutePath();
return true;
@@ -571,10 +571,10 @@ UI2DelegatesManager::UI2DelegatesManager(QQuickWebEngineView *view) : UIDelegate
bool UI2DelegatesManager::initializeImportDirs(QStringList &dirs, QQmlEngine *engine)
{
foreach (const QString &path, engine->importPathList()) {
- QFileInfo fi1(path % QLatin1String("/QtWebEngine/Controls2Delegates/"));
- QFileInfo fi2(path % QLatin1String("/QtWebEngine/UIDelegates/"));
+ QFileInfo fi1(path % QLatin1String("/QtWebEngine/Controls1Delegates/"));
+ QFileInfo fi2(path % QLatin1String("/QtWebEngine/Controls2Delegates/"));
if (fi1.exists() && fi2.exists()) {
- dirs << fi1.absolutePath() << fi2.absolutePath();
+ dirs << fi2.absolutePath() << fi1.absolutePath();
return true;
}
}