diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-27 17:25:35 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-27 17:25:35 +1000 |
| commit | 83bf60ee19bb7c0815549aec5dcc8f4190301cc5 (patch) | |
| tree | 1676c6739ddbdd029ac6083b1afbef3f0e5fd7e3 /src/gui/dialogs/qfiledialog.cpp | |
| parent | d749e70412691134bb4b62d58103c0bc5e9ce90d (diff) | |
| parent | fef5d7b0cbfba93ca108ce9f0785826c0a4ff829 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (22 commits)
Fix accessible menu not returning child name.
Fix broken qglthreads autotest build on Solaris.
Don't store the alignment attribute for spacers
Update changelog for Qt-4.8.0: add QtWebKit notes
Update changelog for Qt 4.8
Fix broken Solaris build (getpwnam_r usage)
Improve sbsv2 whatlog support.
Sentences should end with a period! (Poor man's rebuild trigger.)
Modified SymSQL documentation in sql-driver.qdoc according review comments
Added correct licence headers to symsql source files
Documentation modifications for SymbianSQL added into sql-driver.qdoc
Release Symbian SQL driver
Fixed a typo found by static checker
Added SQL driver plugin implementation for Symbian.
Symbian: Fix qmdiarea autotest regressions
Fix memory leaks in schema validation
Symbian: Added copy-paste functionality to FEP input context
symbian: Implement QNetworkConfiguration::purpose()
Workaround MSVC2010 problems when linking QtWebKit
dos2unix on a webkit source file (fix support for Visual Studio)
...
Diffstat (limited to 'src/gui/dialogs/qfiledialog.cpp')
| -rw-r--r-- | src/gui/dialogs/qfiledialog.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 5e8533e3bc..817cd38085 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -880,7 +880,12 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded passwd *tmpPw; char buf[200]; const int bufSize = sizeof(buf); - int err = getpwnam_r(userName.toLocal8Bit().constData(), &pw, buf, bufSize, &tmpPw); + int err = 0; +#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); +#endif if (err || !tmpPw) return ret; const QString homePath = QString::fromLocal8Bit(pw.pw_dir); |