diff options
author | hjk <hjk@qt.io> | 2019-03-04 09:31:42 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-03-04 12:17:43 +0000 |
commit | d596d72ae8fdb1e936eafadd94004cdea3b4ab64 (patch) | |
tree | 731b146e926e543a6a93394710d28ddb85485d9d /src/lib/corelib/api/projectdata.cpp | |
parent | 50eb4d183ccb526874cefe73c7f4c2129769aa4a (diff) |
Fix some warnings
None of them really necessary or even desirable to fix, but...
tools/launcherinterface.cpp:114:80: warning: ‘void QProcess::finished(int)’ is deprecated:
Use QProcess::finished(int, QProcess::ExitStatus) instead [-Wdeprecated-declarations]
api/projectdata.cpp: In function ‘QString qbs::mapToString(const QVariantMap&, const QString&)’:
api/projectdata.cpp:882:15: warning: ‘void qSort(Container&) [with Container = QStringList]’
is deprecated: Use std::sort [-Wdeprecated-declarations]
parser/qmljsparser.cpp: In member function ‘void QbsQmlJS::Parser::reallocateStack()’:
parser/qmljsparser.cpp:72:104: warning: ‘void* realloc(void*, size_t)’ moving an object of non-trivially copyable type ‘class QStringRef’; use ‘new’ and ‘delete’ instead [-Wclass-memaccess]
etc.
The QStringRef is the only one theoretically applicable, but isn't in
practice given the current implementation.
Change-Id: Idb2a03e3fd096b6ad428615f81266f952d2a8d95
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/api/projectdata.cpp')
-rw-r--r-- | src/lib/corelib/api/projectdata.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp index a3e6eac25..0c3ba186d 100644 --- a/src/lib/corelib/api/projectdata.cpp +++ b/src/lib/corelib/api/projectdata.cpp @@ -879,7 +879,7 @@ QVariant PropertyMap::getModuleProperty(const QString &moduleName, static QString mapToString(const QVariantMap &map, const QString &prefix) { QStringList keys(map.keys()); - qSort(keys); + std::sort(keys.begin(), keys.end()); QString stringRep; for (const QString &key : qAsConst(keys)) { const QVariant &val = map.value(key); |