diff options
| author | Nico Vertriest <nico.vertriest@digia.com> | 2015-05-28 12:45:48 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-28 13:03:39 +0000 |
| commit | 52d024c26ea0aadfe79dbbbd8a3d6f3ac0a67677 (patch) | |
| tree | 240ed3b5b3f8deb3263736873758d3e353396b3c /src/shared/proparser | |
| parent | fa6d0f1231a5f2a597489120f1b506d092b8520a (diff) | |
Replace MAC OS X with OS X
Task-number: QTBUG-46374
Change-Id: I7bc633ab551740bd328a24b0ccae1d534af47138
Reviewed-by: Martin Smith <martin.smith@digia.com>
(cherry picked from qtbase/a7f2af09114cfa0996794c85bc48a601f665772d)
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Diffstat (limited to 'src/shared/proparser')
| -rw-r--r-- | src/shared/proparser/qmakeevaluator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index ef8179065af..86ff07b6550 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -85,7 +85,7 @@ static int idealThreadCount() // we don't need them all here int cores = 1; # if defined(Q_OS_BSD4) - // FreeBSD, OpenBSD, NetBSD, BSD/OS, Mac OS X + // FreeBSD, OpenBSD, NetBSD, BSD/OS, OS X size_t len = sizeof(cores); int mib[2]; mib[0] = CTL_HW; |