From 975763169166961f66826998ac44d88ffe3e535e Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 13 Apr 2015 15:11:10 +0200 Subject: [PATCH] Add location to the supported module list Qt 5.5 introduces Qt Location and the plugins were not deployed so far. Change-Id: Ic06322a672a392a87b1c0f159b7028651fc2762a Reviewed-by: Alex Blasche --- src/windeployqt/main.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 0095d03..a350687 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -99,7 +99,8 @@ enum QtModule Qt3DRendererModule = 0x040000000000, Qt3DQuickModule = 0x080000000000, Qt3DQuickRendererModule = 0x100000000000, - Qt3DInputModule = 0x200000000000 + Qt3DInputModule = 0x200000000000, + QtLocationModule = 0x400000000000 }; struct QtModuleEntry { @@ -154,7 +155,8 @@ QtModuleEntry qtModuleEntries[] = { { Qt3DRendererModule, "3drenderer", "Qt53DRenderer", 0 }, { Qt3DQuickModule, "3dquick", "Qt53DQuick", 0 }, { Qt3DQuickRendererModule, "3dquickrenderer", "Qt53DQuickRenderer", 0 }, - { Qt3DInputModule, "3dinput", "Qt35DInput", 0 } + { Qt3DInputModule, "3dinput", "Qt35DInput", 0 }, + { QtLocationModule, "geoservices", "Qt5Location", 0 } }; static const char webKitProcessC[] = "QtWebProcess"; @@ -734,6 +736,8 @@ static inline quint64 qtModuleForPlugin(const QString &subDirName) return QtDeclarativeModule; if (subDirName == QLatin1String("position")) return QtPositioningModule; + if (subDirName == QLatin1String("geoservices")) + return QtLocationModule; if (subDirName == QLatin1String("sensors") || subDirName == QLatin1String("sensorgestures")) return QtSensorsModule; if (subDirName == QLatin1String("qtwebengine")) -- 2.7.4