diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-02 13:00:18 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-02 13:00:18 +0200 |
| commit | 51afc1eb8ebc101ced5874eeadd73d5dfb8612bb (patch) | |
| tree | 0f85822e97b9b1fb63a8792c2b9b85ab982270b1 /src/sdk | |
| parent | e89721bce16d6486e47b5b88d24467face5a11aa (diff) | |
| parent | 8c9831108a2aa591908b9548dec911dbefa4fffb (diff) | |
Merge remote-tracking branch 'origin/1.6'
Conflicts:
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
Change-Id: I32a2a17b8fd7dc0f1f9c12272fc5f814ea5d86cb
Diffstat (limited to 'src/sdk')
| -rw-r--r-- | src/sdk/installerbase.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 3629cc22f..a3141def9 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2012-2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Installer Framework. @@ -103,6 +103,14 @@ static QStringList repositories(const QStringList &arguments, const int index) int main(int argc, char *argv[]) { +// increase maximum numbers of file descriptors +#if defined (Q_OS_MAC) + struct rlimit rl; + getrlimit(RLIMIT_NOFILE, &rl); + rl.rlim_cur = qMin((rlim_t)OPEN_MAX, rl.rlim_max); + setrlimit(RLIMIT_NOFILE, &rl); +#endif + QStringList args = QInstaller::parseCommandLineArgs(argc, argv); // hack to use cleanlooks if it is under Ubuntu |