diff options
author | Eike Ziller <eike.ziller@digia.com> | 2014-06-16 16:15:22 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2014-06-16 16:15:22 +0200 |
commit | 130e66cff25ebdcd375ba6d746fb822bddee3d73 (patch) | |
tree | 36d7d35f31008408839d6322dec6379b9279b755 /src/tools | |
parent | c408285b9055fc821e843cbdcd0ed45d9ade479a (diff) | |
parent | 6fd6291ac82b9caf94afe6b9ae8b3d19a5dab317 (diff) | |
download | qt-creator-130e66cff25ebdcd375ba6d746fb822bddee3d73.tar.gz |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
src/shared/qbs
Change-Id: I9567aa9331c3674cdce50b940c3ec2b5def7bd3f
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/sdktool/main.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/tools/sdktool/main.cpp b/src/tools/sdktool/main.cpp index 92d9326846..5f6e62682d 100644 --- a/src/tools/sdktool/main.cpp +++ b/src/tools/sdktool/main.cpp @@ -159,6 +159,15 @@ int parseArguments(const QStringList &args, Settings *s, const QList<Operation * int main(int argc, char *argv[]) { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)) + // Since 5.3, Qt by default aborts if the effective user id is different than the + // real user id. However, in IFW on Mac we use setuid to 'elevate' + // permissions if needed. This is considered safe because the user has to provide + // the credentials manually - an attack would require at least access to the + // user's environment. + QCoreApplication::setSetuidAllowed(true); +#endif + QCoreApplication a(argc, argv); Settings settings; |