summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-12-07 10:22:48 +0100
committerKai Koehne <kai.koehne@qt.io>2018-12-07 09:53:49 +0000
commitc52ac7fa312ffbe5d9dd9d388395061d5d2ea81e (patch)
tree23030e000cbcc9dfee38f45a7ec4668c6006a312
parenta165d75dcbb7ce410e414b4b31d746ab3774dc11 (diff)
downloadqttools-c52ac7fa312ffbe5d9dd9d388395061d5d2ea81e.tar.gz
windeployqt: Remove unused method
Amends 88e02bb0a9b97d6 Change-Id: Ifd614a0cd985ac695817b257830aa07de8041ee4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--src/windeployqt/main.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index efffc5d05..4d5586148 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -1181,24 +1181,6 @@ static bool updateLibrary(const QString &sourceFileName, const QString &targetDi
return true;
}
-// Check for a Qt Quick Controls import path and return the version.
-// 'QtQuick/Controls' ==> 1, or 'QtQuick/Controls.2' ==> 2.
-static inline int quickControlsImportPath(const QString &ip)
-{
- if (ip.contains(QLatin1String("Qt/labs/calendar"))
- || ip.contains(QLatin1String("Qt/labs/folderlistmodel"))
- || ip.contains(QLatin1String("Qt/labs/settings"))
- || ip.contains(QLatin1String("QtQuick/Templates.2"))
- || ip.contains(QLatin1String("QtQuick/Controls.2"))) {
- return 2;
- }
- if (ip.endsWith(QLatin1String("QtQuick/Dialogs")) || ip.contains(QLatin1String("QtQuick/Dialogs/"))
- || ip.contains(QLatin1String("QtQuick/Controls"))) {
- return 1; // Dialogs only in v1, so far; no version number on directory: v1.
- }
- return 0; // Non-controls import
-}
-
static DeployResult deploy(const Options &options,
const QMap<QString, QString> &qmakeVariables,
QString *errorMessage)