aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-06-21 08:40:47 +0200
committerhjk <hjk@qt.io>2019-07-02 12:48:54 +0000
commit36fcd5213667d04008c39c38f9d8787dc6b839fd (patch)
treeaa9c23a7b50221cbda6c3f1aad34fe0ed013e84f /src/plugins/android
parenta6d5da5af2d62e6f4d32ee4fb84e969b8bad0cd9 (diff)
Utils: Add toSet/toList functions
As replacement for functionality that's being deprecated in Qt but still useful or needed, or that cannot easily be handled without resorting to #if QT_VERSION checks in user code. Change-Id: Id3575a54ff944bf0e89d452d13944fcaee270208 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/android')
-rw-r--r--src/plugins/android/androidmanifesteditorwidget.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index 72ab0c9984a..d8e8b003c6a 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -45,6 +45,7 @@
#include <texteditor/texteditoractionhandler.h>
#include <texteditor/texteditor.h>
+
#include <utils/algorithm.h>
#include <utils/utilsicons.h>
@@ -924,7 +925,7 @@ void AndroidManifestEditorWidget::parseManifest(QXmlStreamReader &reader, QXmlSt
QXmlStreamAttributes result = modifyXmlStreamAttributes(attributes, keys, values);
writer.writeAttributes(result);
- QSet<QString> permissions = m_permissionsModel->permissions().toSet();
+ QSet<QString> permissions = Utils::toSet(m_permissionsModel->permissions());
bool foundUsesSdk = false;
bool foundPermissionComment = false;