summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
Commit message (Collapse)AuthorAgeFilesLines
* Blackberry: Fix QFileSystemEngine::tempPath()Thomas McGuire2012-08-301-2/+5
| | | | | | | | | | | | | Apparently it depends on the user and/or firmware version on whether TMPDIR or TEMP is set, so try both. Additionally, fall back to /tmp if neither is set, as that seems to be present on all devices. This is a backport of a135d87a0f8ec24445e13fb54f4316e4ca7473be from Qt5. Change-Id: I1637f4ab74c8c8bd350b4efb451c2143c0642796 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QUrl: fix thread safety.David Faure2012-08-232-49/+181
| | | | | | | | | | | | | | | Developers expect const methods on the same QUrl instance to be usable from multiple threads (including copying and modifying the copy). The delayed parsing and internal cache of encoded strings break this, however (and the implicit sharing, for the case of copying). Protection with a mutex fixes this. Qt-5.0 doesn't have this issue, since QUrl doesn't do delayed parsing anymore. Change-Id: Ie2674e46eb7416b0e753323b673c10f9d3457f6d Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0189-178/+178
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* QUrl: document that setIdnWhitelist isn't thread-safeMarc Mutz2012-07-281-0/+3
| | | | | Change-Id: Ia77a211f1d670d81b2a4783693ed09533d53eceb Reviewed-by: David Faure <faure@kde.org>
* QUrl: add missing detach() in setEncodedUrl, spotted by Marc Mutz.David Faure2012-07-221-2/+2
| | | | | | | Reported-by: Marc Mutz <marc.mutz@kdab.com> Change-Id: If53957bafa9c077981c8ec5107313bc25469b579 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qurl.cpp: Remove trailing whitespaces.David Faure2012-07-211-19/+19
| | | | | Change-Id: Ic075b50cff71fcc2e5dd5c14d55ef2f587cd2418 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc: Fix QUrl::isLocalFile documentationSergio Ahumada2012-07-211-1/+1
| | | | | | | | | | | This function was introduced in 4.7 by a2f797b52c4274a62a7cf1f0939aca1429afe211 but then reverted by 98e935eed5549e479f6666680aed1711dc42111c Task-number: QTBUG-21293 Change-Id: I6ec9c6696e5c85e44774184010eb9135ef7f3365 Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> (cherry picked from commit e2c27b3052fe49a19c4092759682bddf2c2a37f7)
* Fix QFile append on windowsShane Kearns2012-06-092-2/+10
| | | | | | | | | | | | 1. make windows file engine seek to end on open to match unix/symbian 2. make qfile forcibly seek the file engine in case a custom file engine has the same bug. Task-number: QTBUG-25906 Change-Id: I62a26519a9401e547ff77bd8a71027cb361dc671 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Fix cases where functions are called with a drive and no slashAndy Shaw2012-05-161-9/+9
| | | | | | | | | | | | | | | | When a file is specified on a path that includes a drive letter followed by a colon but no slash then it didn't always account for the fact that this refers to the current path on that drive. This fixes the problems in completeBaseName(), baseName() and path(). Tests are also added for these three cases and some others too. Task-number: QTBUG-25353 Change-Id: I47a197c6af066f532442ad269be57597ec61303a Reviewed-by: Irfan Omair <irfan.omair@gmail.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit cfb44c6528b2518274bf157388832d1d610ce0e4)
* Fix IPv6 address returned from QUrl::hostShane Kearns2012-04-231-5/+4
| | | | | | | | | | | | When passing an IPv6 address through QNetworkProxyQuery, it is stored in a QUrl internally. There was a bug in QUrl where it strips the [] surrounding an IPv6 address only if they were present in the input, otherwise it added them. Now the behaviour is the same as Qt5 ([] are always stripped). Change-Id: I42e020ce30d18a4108f1dd4428809fed07991680 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update QSettings and Mac OS X documentation with App Store informationPasi Matilainen2012-04-231-0/+21
| | | | | | | | | | | Add information about changing the location of global Qt settings to QSettings documentation, and general information about submitting Qt apps to the Mac App Store to the "Qt for Mac OS X - Specific Issues" document. Task-number: QTBUG-16549 Change-Id: Ic0210e8f4d3c3f6369032abd5c1e214b4200b179 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix QFileSystemEngine::tempPath on Blackberry OSRafael Roquetto2012-04-011-0/+7
| | | | | | | | | | | Unlike Unix, Blackberry OS stores the location of the temporary directory into the TEMP environment variable. Change-Id: I31f50fc4b160e5594339c4fcd62613963cc1484f Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix regressions due to partial QSslSocket::peek fixShane Kearns2012-03-301-0/+5
| | | | | | | | | | The fix broke HTTPS transactions with chunked encoding. It also broke use of a QSslSocket in unencrypted mode where peek and read calls are mixed. See change 68b1d5c17aa38d5921bdade2b0e0cb67c6c90513. Change-Id: Ib115b3737b0e4217496f5def10aaaea3c6452ff8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix documentation errorShane Kearns2012-03-131-1/+0
| | | | | | | | The function wasn't introduced in 4.8, we just documented its behaviour properly in that release. Change-Id: I0560be978612eaed4e632ea191c4b2ba19b4e7a8 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Optimise QFile::seek that doesn't move the file pointerShane Kearns2012-03-131-0/+3
| | | | | | | | | If the seek position matches the current file position, then avoid doing an implicit flush that could be expensive. Change-Id: I019858ffb36fe832b9aee8da0a7803cafc8f7f75 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Enable storage of global Qt settings in app-local settings file on MacPasi Matilainen2012-03-071-0/+82
| | | | | | | | | | | | | The Mac App Store has limitations on where applications can write their settings, and com.trolltech.plist is not allowed. Changed the settings code to store all settings in the app-local file when the application runs in sandbox, or when the application's Info.plist contains a key "ForAppStore" with value "yes". The application's bundle identifier is also used for naming the settings file in these cases. Task-number: QTBUG-16549 Change-Id: Idd2241fbd7eb346da987226f05460642b0d6e5a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Don't allow app panic on QProcess destruction, kill or terminateMurray Read2012-03-071-4/+12
| | | | | | | | | | | | | | | | QProcess destruction will call kill() if the process is still running. PRocess::Kill() and Terminate() both require the PowerMgmt capability to operate on Symbian, otherwise a KERN-EXEC 46 panic happens. An app should be able to use QProcess safely if it doesn't have PowerMgmt capability, it should just be prevented from trying to kill the created process. Now a debug message is issued on ~QProcess(), kill() or terminate() if the capability is not present, rather than actually trying to kill/terminate the process. Task-number: ou1cimx1#985227 Change-Id: I3242ca2c39528c70c2c79e39f6a6384dd72f6ae6 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* QWindowsPipeWriter could terminate the process to earlyMartin Petersson2012-02-281-1/+1
| | | | | | | | | | | | | | When the QWindowsPipeWriter is deleted it will wait for the thread to exit. This wait was set to 100 ms which will not always be enough time for the thread to exit, in that case the thread will be terminated. This will increase the timeout to 30 seconds that should be more then enough time for the thread to exit by itself. Task-number: QTBUG-4425 Change-Id: I52567066b757c2bbfda6887f504cf80de262b988 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixes QProcess on QNXRafael Roquetto2012-02-203-82/+67
| | | | | | | | | | | | | | This patch first re-enables childStartedPipe on QNX and uses, just like other platforms, to monitor the inferior process life cycle. This also aligns QNX-specific code logic closer to the common QProcess logic, making it unecessary to have custom versions of functions such as QProcess::waitForStarted(). The only difference that remains is the use of spawn() instead of fork(), because both fork() and vfork() do not support multi-threaded applications on QNX and will segfault. Change-Id: I8e1f9823629fcb5e7c3c128fafc2542a403b969e Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Checking for directory exists in failed QDir::mkpath on SymbianMurray Read2012-02-151-2/+9
| | | | | | | | | | | | | | QDir::mkpath should return true if the directory already exists. In the new native Symbian implementation, RFs returns KErrPermission denied when you try to access some data caged directories such as C:\private. This was being interpreted as failure, as the code expected KErrAlreadyExists for the case where the directory exists. In this circumstance we now check if the directory already exists. Task-number: ou1cimx1#974477 Change-Id: Ie476219bc963c23d3c7e1773ebded8ecf137fd3c Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Initializes seqDumpPos on qiodevice.cppNick Ratelle2012-02-141-1/+2
| | | | | | | | | | | | | | | This was spotted by RIM static code checking team. seqDumpPos is a dummy variable which is only used on sequential mode. It is used as a simultaneous storage area of both pPos and pDevicePos when in sequential mode, to keep both in sync. They just suggested that it would be a good practice to initialize the variable, since it does not have any side effect, and there's not much value on not doing it. cherry-picked from qt5/qtbase: e7e87993042ac9a4fd899da5ea0340322b47d9ff Change-Id: Ib0d3299b03de9df539567c92bda5e6fe9f95ba7a Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
* Fixed compiler warning about unused variable with QT_NO_TEXTCODEC.Andreas Holzammer2012-02-111-0/+3
| | | | | | | Task-number: QTBUG-22512 Change-Id: I3a6605ce19ac8def6a4fdfbf2904f7c165cbfc8e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* realpath(X,0) IS supported on QNX.Nick Ratelle2012-02-091-1/+1
| | | | | | | | | | | Adds check for Q_OS_QNX to force QFileSystemEntry QFileSystemEngine::canonicalName() use realpath(X, 0) on QNX as well. cherry-picked from qt5/qtbase ee592fc042efc19acbc5407f5277abe7372c138d Change-Id: I715b1a226cc89831333f70a295c5d269bf6a8baf Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Some small doc fixes, typos and removal of one incorrect paragraphAndy Shaw2012-02-081-5/+0
| | | | | | | | The QTextStream paragraph that is removed referred to something that is incorrect. This was confirmed for Windows, Linux and Mac. Change-Id: Ibac8f82482f2060308b5b8485d6da228bdf52fe6 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Changes in Symbian CleanupStack use to allow dodgy app startMurray Read2012-02-081-12/+9
| | | | | | | | | | | | | | Some important apps were found to invoke Qt code using the Symbian CleanupStack during static data initialization. This is not legal Qt code, but due to the importance of maintaining compatability with these apps, Qt has been modified to avoid the problem. In one case by removing unnessary use of CleanupStack. In the other by creating a temporary CleanupStack. Task-number: ou1cimx1#960665 Change-Id: Iff631a638dceec10aa38add88ba93a63a831a574 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fix progress bar values >100% when http upload is retriedShane Kearns2012-02-032-1/+2
| | | | | | | | | | | | | | | | If a http upload (PUT or POST) fails, the IO device is reset and the upload is retried a second time. Now we also reset the progress counter in the wrapper class QNonContigiousByteDevice. That way the progress bar goes back to 0% and stops at 100% Previously if the 1st attempt failed at 20%, the progress values would carry on from 20% and finish at 120%. Task-number: ou1cimx1#970373 Task-number: QTBUG-23993 Change-Id: Ifc9963595113cf3001ed45f94f525e2305ad479b Reviewed-by: Markus Goetz <markus@woboq.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Change QUrl::toLocalFile to return path for relative urlsAapo Haapanen2012-02-021-1/+8
| | | | | | | | | | | | | | | | | | This change reverts the behaviour of QUrl::toLocalFile to the state it was before 4.8. After this change the function returns the path if the url is relative. Before this change an empty QString was returned. A relative url can refer to a local file, but that can't be determined from the url alone. Thus, it makes sense to return the path for such urls. Added documentation to explain that the function works like this to maintain backward compatability in 4.x, but the handling of relative URLs will change in 5.0. Task-number: QTBUG-19827 Change-Id: I8bb8f4603a5936c0359afc1b6ff98824fad6cbc9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed QFile::link behaviour for WinCE devices.jaanttil2012-01-311-0/+1
| | | | | | | | | | | In WEC7 both arguments given for ScCreateShortcut needs to be given in Windows format. Apparently older WinCE devices has accepted also Unix format but this is not anymore true for WEC7. The Windows format works for older WinCE versions as well. Change-Id: Ibea55c5fd8d5a981cdb06e34a20c369bf3b53200 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
* Various qt documentation fixes (wk 43)artoka2012-01-311-0/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12389 Task-number: QTBUG-16667 Task-number: QTBUG-6151 Task-number: QTBUG-8625 Task-number: QTBUG-19808 Task-number: QTBUG-12096 Task-number: QTBUG-1231 Task-number: QTBUG-21073 Task-number: QTBUG-8939 Task-number: QTBUG-20399 Task-number: QTBUG-20944 Task-number: QTBUG-7542 Task-number: QTBUG-22095 Task-number: QTBUG-11278 Task-number: QTBUG-15653 Change-Id: Ibc369998d06e7f2f11b01a1ba4c2fb927e3c065b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fixed fileiterator issue for WEC7.Janne Anttila2012-01-301-0/+2
| | | | | | | | | | | | | | | WEC7 does not support FIND_FIRST_EX_LARGE_FETCH with FindFirstFileEx, but windowsVersion for WEC7 is still resolved as WV_WINDOWS7. If the FIND_FIRST_EX_LARGE_FETCH flag is passed to FindFirstFileEx in WEC7, the method does never find any files from given directory. Changed FIND_FIRST_EX_LARGE_FETCH flag to apply only when Q_OS_WINCE is not defined. Task-number: QTBUG-22503 Change-Id: Ic38cf745cda7ee7b23da67dc390ac0e6d04158cd Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com> (cherry picked from commit 55a5faadb5961c4c6a81de80c5cb3687da29d4de)
* qfilesystemengine_win.cpp: compile with namespaced QtJoerg Bornemann2012-01-251-7/+6
| | | | | | | | SidCleanup struct must not be in the INCLUDE_NAMESPACE. Change-Id: Ic51f1734af583c0ba7f715f7b27f314211e698c5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Fix BC break with QAbstractFileEngine "mount points"Shane Kearns2012-01-252-4/+11
| | | | | | | | | | | | | | | | | File system cached metadata can't be trusted when custom file engines are in use, because the custom file engine may want to override the metadata. (e.g. present an archive file as a directory) Therefore, check if a file engine should be instantiated for each result in QDirIterator. This is a fast check if no custom file engines are registered. When pushing a directory (using QDirIterator::SubDirectories) the file engine needs to be instantiated also. Task-number: QTBUG-23688 Task-number: ou1cimx1#965023 Change-Id: I0114c8df6258535553783a2486131c4194926649 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* remove NTFS junction and mount point detectionJoerg Bornemann2012-01-181-2/+1
| | | | | | | | Qt now treats neither NTFS junctions nor mount points as symlinks. Task-number: QTBUG-20431 Change-Id: Id9bd17f8b93afe9aeb307358ddad5726913961f3 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Revert "fix NTFS mount points"Joerg Bornemann2012-01-183-24/+12
| | | | | | | | | | We agreed on treating neither junctions nor mount points as symlinks. This will be handled in another commit. This reverts commit 611eb9e5e5c8fe8035482e502b84263f43779dd8. Change-Id: I19f0bd841c7e6dd6e65e5c8df4bdfa1d6f08ce28 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* fix NTFS mount pointsJoerg Bornemann2012-01-173-12/+24
| | | | | | | | | | | | NTFS mount points are not treated as symlinks, because they might not have a link target. This is the case when a volume is mounted as a single mount point without a drive letter. This patch fixes building Qt in an NTFS mount point. Task-number: QTBUG-20431 Change-Id: Ie2e15212e1a7ca7fa0067b7ca8857e243e42c21a Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Windows: Fix qt_ntfs_permission_lookupMiikka Heikkinen2012-01-161-11/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | Specifying qt_ntfs_permission_lookup++ in application code didn't make qfilesystemengine_win.cpp respect Windows ACL as it was supposed to. This was because GetTokenInformation for TokenUser failed always in resolveLibs() function, because the TOKEN_USER struct that was given to it wasn't large enough to contain both TOKEN_USER and SID structs that GetTokenInformation wants to return in this case. Fixed by calling GetTokenInformation twice, first to determine the required size, and then another time to get the actual token info. Additionally, the SID returned as part of the token info needs to be stored for the lifetime of the application, as the TRUSTEE_W struct has a pointer to it (currentUserTrusteeW). The worldTrusteeW initialization also required a change to properly store the SID. Note: The dynamic resolution of FreeSid and other SID manipulating functions doesn't appear to be necessary, as they are found on the same ifdef level (in winbase.h) as the GetTokenInformation, which already isn't dynamically resolved. Task-number: QTBUG-247 Change-Id: If5b43faeded351c45b52a63854a10d9f618e33ef Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Build fix for WINCE to qfsfileengine_win.cppJanne Anttila2012-01-121-1/+1
| | | | | | | | | | | | | | | | QFileSystemEngine::currentPath() returns QFileSystemEntry, but this method expects QString return value. -> Code does not compile for WinCE Switched code to use "QFileSystemEngine::currentPath().filePath()" correspondigly as Windows desktop does if filename does not contain drive letter. This is ok, since WinCE does not support drive letters. Task-number: QTBUG-22499 Change-Id: I211b56a5511e6c3e1b1c4009c8ee2a9c6d2f1746 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1189-89/+89
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Symbian - Fix QFile::map with non page aligned offsetsShane Kearns2011-12-151-3/+5
| | | | | | | | | | | | | | | | | Although it is not documented, RFileMap native API requires the offset into the file to be a multiple of the page size. Round down the offset requested by the user to the page size. Add back the difference before returning the base address to the user. e.g. if the offset passed to QFile::map was 5000: The offset passed to RFileMap will be 4096 The address returned to the user will be the RFileMap::Base() + 904 The modified address is used to key the hash of file mappings, so that QFile::unmap() can be passed the modified address without needing changes. Reviewed-by: mread Task-number: ou1cimx#953054
* doc - document symbian behaviour of QFile::linkShane Kearns2011-11-301-2/+1
| | | | | Task-number: ou1cimx1#943243 Reviewed-by: mread
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-11-102-6158/+6730
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: networking: regenerate effective TLD table for cookies QNAM: Fix authentication cache when the password is in the URL
| * networking: regenerate effective TLD table for cookiesPeter Hartmann2011-11-102-6158/+6730
| | | | | | | | Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-10-311-1/+4
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QFile::copy() returning false but error() being NoError
| * | Fix QFile::copy() returning false but error() being NoErrorxiechyong2011-10-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Calling close() after setError() will unset the error. Task-number: QTBUG-11982 Merge-request: 2712 Reviewed-by: ossi
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-10-281-0/+6
|\ \ \ | | |/ | |/| | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QIODevice - disallow setTextMode when not open
| * | QIODevice - disallow setTextMode when not openShane Kearns2011-10-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setTextMode() before open() would make the device appear to be already open and cause later errors. Added a qWarning and documentation update to prevent this API misuse Task-number: QTBUG-20905 Change-Id: I2e06cd8e79f4afcf27417ac0eae6ebef980a17aa Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> (cherry picked from commit 29c30a20bab4c4ea892b95c08c71bb5f136bb82c)
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-10-175-16/+31
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-142-2/+1
| |\ \ | | |/
| * | Fix incorrect QFileInfo permissions on windowsShane Kearns2011-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Requesting the write permission marked the read permission as known without having retrieved it. A subsequent request for read permission would return false. Task-Number: QTBUG-20714 Reviewed-By: mread
| * | symbian - document behaviour of QFile::handle()Shane Kearns2011-09-281-0/+7
| | |
generated by cgit v0.12 at 2024-12-26 16:36:38 (GMT)