diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2014-09-01 09:46:39 (GMT) |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@digia.com> | 2014-09-05 10:17:30 (GMT) |
| commit | a10768455352eb3e49b2123234cd096a032d3474 (patch) | |
| tree | 55f327647476e99ff851ad5e1ffd9b7ece2b3f7a /src/gui | |
| parent | 4ae2df97db4bf2e07b7c3b9f03957eb62a36e969 (diff) | |
| download | Qt-a10768455352eb3e49b2123234cd096a032d3474.zip Qt-a10768455352eb3e49b2123234cd096a032d3474.tar.gz Qt-a10768455352eb3e49b2123234cd096a032d3474.tar.bz2 | |
Revert previous QFileDialog fix for Solaris
This reverts previous commit 6d47f5a168e350a6d9cbddb343ff9d75ffbd2c04,
that broke compilation of QFileDialog in solaris (Sun CC).
Solaris defaults to Draft version of getpwnam_r if _POSIX_C_SOURCE is not
defined or < 199506L, and _POSIX_VERSION is defined as 199506L even when
_POSIX_C_SOURCE is not used, so it cannot be used to detect correct
posix support.
Task-number: QTBUG-21451
Change-Id: Ibbf2b9de1dea74e7d8b6003d1a4e3686e5858525
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/dialogs/qfiledialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 3868c21..12591da 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -903,7 +903,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded char buf[200]; const int bufSize = sizeof(buf); int err = 0; -#if defined(Q_OS_SOLARIS) && defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 < 199506L) +#if defined(Q_OS_SOLARIS) && (_POSIX_C_SOURCE - 0 < 199506L) tmpPw = getpwnam_r(userName.toLocal8Bit().constData(), &pw, buf, bufSize); #else err = getpwnam_r(userName.toLocal8Bit().constData(), &pw, buf, bufSize, &tmpPw); |