summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use effective user id instead of getloginJoão Abecasis2010-12-081-12/+16
| | | | | | And check if this gives us more reliable results. Reviewed-by: Prasanth Ullattil
* Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-08157-3045/+8321
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: (218 commits) Fix compile error in tst_qfileinfo on Mac/Linux Fix tst_QFileInfo owner() & group() failure on Windows. Fix tst_QFileInfo::canonicalFilePath failure on Windows Fix QDir::relativeFilePath Fix spelling in comments Add missing license header to test case Define _WIN32_WINNT before any includes New attempt at fixing compilation failure Removing unused duplicate definitions No symbolic links in Windows CE Set minimum target Windows version to 2000 More missing includes Add missing include Fix compile error Update def files Fix tst_QFile::caseSensitivity test on Mac Fix typo in QFile test Add test generated files to .gitignore Fix compile error for qdir autotest on symbian3 QtDeclarative: make autotests compile on symbian ...
| * Merge branch 'earth/file-engine-refactor' of ↵Qt Continuous Integration System2010-12-07157-3045/+8321
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration * 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: (218 commits) Fix compile error in tst_qfileinfo on Mac/Linux Fix tst_QFileInfo owner() & group() failure on Windows. Fix tst_QFileInfo::canonicalFilePath failure on Windows Fix QDir::relativeFilePath Fix spelling in comments Add missing license header to test case Define _WIN32_WINNT before any includes New attempt at fixing compilation failure Removing unused duplicate definitions No symbolic links in Windows CE Set minimum target Windows version to 2000 More missing includes Add missing include Fix compile error Update def files Fix tst_QFile::caseSensitivity test on Mac Fix typo in QFile test Add test generated files to .gitignore Fix compile error for qdir autotest on symbian3 QtDeclarative: make autotests compile on symbian ...
| | * Fix compile error in tst_qfileinfo on Mac/LinuxPrasanth Ullattil2010-12-071-0/+2
| | | | | | | | | | | | Reviewed-by: Shane Kearns
| | * Fix tst_QFileInfo owner() & group() failure on Windows.Prasanth Ullattil2010-12-061-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | The ownership of newly created files are transferred to the Administrator group only if the application is running with Admin privilages. This will happen only on Windows 7 & Vista, on XP user has the ownership. Reviewed-by: Joao
| | * Fix tst_QFileInfo::canonicalFilePath failure on WindowsPrasanth Ullattil2010-12-061-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the test application is running without administrative privilages, the CreateSymbolicLink() can incorrectly return success. To handle this we need to check whether GetLastError() returns ERROR_PRIVILEGE_NOT_HELD or not. Reviewed-by: Joao
| | * Fix QDir::relativeFilePathJoão Abecasis2010-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to call cleanPath on the result of absolutePath, before returning it to the user, but stopped doing that. relativeFilePath actually depended on that and broke. Fixed now. Reviewed-by: Prasanth Ullattil
| | * Fix spelling in commentsJoão Abecasis2010-12-056-12/+12
| | |
| | * Add missing license header to test caseJoão Abecasis2010-12-051-0/+41
| | |
| | * Define _WIN32_WINNT before any includesJoão Abecasis2010-12-051-4/+4
| | | | | | | | | | | | ... to ensure it's properly defined before <windows.h> is ever included.
| | * New attempt at fixing compilation failureJoão Abecasis2010-12-052-6/+4
| | | | | | | | | | | | | | | | | | | | | Including windows.h and defining _WIN32_WINNT didn't cut it. Instead, fall back to explicitly #defining IO_REPARSE_TAG_SYMLINK in metadata header, since it's all that's needed there. In windows-specific iterator implementation ensure _WIN32_WINNT >= 0x0500.
| | * Removing unused duplicate definitionsJoão Abecasis2010-12-051-27/+0
| | | | | | | | | | | | | | | These functions have been forked in qfilesystemengine_win.cpp and are no longer used in this file. Cleaning up.
| | * No symbolic links in Windows CEJoão Abecasis2010-12-041-0/+2
| | |
| | * Set minimum target Windows version to 2000João Abecasis2010-12-042-0/+8
| | | | | | | | | | | | Required for FindFirstFileEx.
| | * More missing includesJoão Abecasis2010-12-042-0/+3
| | |
| | * Add missing includeJoão Abecasis2010-12-041-0/+1
| | |
| | * Fix compile errorShane Kearns2010-12-031-0/+2
| | | | | | | | | | | | | | | | | | | | | Missing QT_BEGIN_NAMESPACE caused error when the namespace macros are defined. Reviewed-by: mread
| | * Update def filesShane Kearns2010-12-024-3/+12
| | | | | | | | | | | | | | | | | | refreeze on top of master def files (we have added some exports to QtCore) Reviewed-by: Trust Me
| | * Merge remote branch 'origin/master' into file-engine-refactorJoão Abecasis2010-12-02384-7206/+24094
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master's version of conflicting def files picked. Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def
| | * | Fix tst_QFile::caseSensitivity test on MacJoão Abecasis2010-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | Mac's default file system is case-preserving, but case-insensitive, otherwise.
| | * | Fix typo in QFile testJoão Abecasis2010-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | If file system isn't case sensitive, open succeeds as should reading, with the read data matching testData.
| | * | Add test generated files to .gitignoreShane Kearns2010-11-302-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests/.gitignore, did not inherit from the main one, which causes git to show hundreds of new files when running tests on symbian. Reviewed-by: Markus Goetz
| | * | Fix compile error for qdir autotest on symbian3Shane Kearns2010-11-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Header file is in a different location compared to previous SDK versions Reviewed-by: Miikka Heikkinen
| | * | QtDeclarative: make autotests compile on symbianShane Kearns2010-11-307-22/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move tests for private classes inside private_tests scope Add missing libraries Add QT_NO_CONCURRENT ifdef around a test case Define Q_DECLARATIVE_PRIVATE_EXPORT as Q_AUTOTEST_EXPORT, so the classes are exported for autotests, previously they were exported on every OS except symbian. (this doesn't affect exports for production builds) Reviewed-by: Miikka Heikkinen
| | * | Add symbian platform security and case sensitivity test casesShane Kearns2010-11-301-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On symbian, check that opening files in protected locations either succeeds or fails cleanly as expected by the capabilities the test is compiled with. This acts as a regression test for opening files in /resource, and also checks the other locations behave as expected. On all platforms, check file created with a mixed case filename can be accessed by it's aliases that differ only in case (or not) depending on the OS case sensitivity. For Windows/Symbian, file should be accessible by altered case aliases For other OS, it should not (other OS supported by Qt are unix like) Reviewed-by: mread
| | * | Fix buffered/unbuffered mode issues on symbianShane Kearns2010-11-302-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug in the symbian file server, files in /resource can't be opened for unbuffered read, only for default mode read. (it doesn't mask the cache control flags when doing the security check) So read will always be done in default mode. Symptom of this was that QML plugin loading failed as the plugin description in /resource could not be read. Buffered or unbuffered writes (i.e. whether the cache should be write through or write behind) are controlled by the QIODevice::Unbuffered flag, therefore it needs to be passed through to the file engine. An optimisation for unix and windows to force unbuffered mode in the file engine is inappropriate (as that is referring to buffering in the standard library, which is bypassed entirely by using the low level RFile to open files on symbian) Reviewed-by: joao
| | * | Update with def files merged from masterShane Kearns2010-11-305-7/+468
| | | | | | | | | | | | | | | | | | | | | | | | This set of def files is good to merge back, if the merge is done soon. Reviewed-by: Trust Me
| | * | Fix compile error on symbianShane Kearns2010-11-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian doesn't have file owners, the resolveUserName / resolveGroupName functions have been correctly moved to unix only scope which caused a compile error. This change makes the QFSFileEngine::owner[Id] return -2 / QString() for symbian directly. Reviewed-by: Markus Goetz
| | * | Fix link() autotest on WindowsPrasanth Ullattil2010-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This was missed from the previous commit. Reviewed-by: Joao
| | * | Flagging some more tests as parallelizableJoão Abecasis2010-11-258-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests have no GUI nor do they depend on network, so let's see what breaks if they're parallelized :-) Reviewed-by: Olivier Goffart
| | * | Fix QFile::link unit testJoão Abecasis2010-11-251-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Absolute path for the link target can contain "../" elements and so needs to be cleaned. Really depends on the definition for SRCDIR. Reviewed-by: Prasanth Ullattil
| | * | Fix QFileDialog autotestJoão Abecasis2010-11-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test expects to see a directory in SRCDIR. Copying the resources directory from QAbstractFileEngine autotest shouldn't impact the git repository and serves our purposes well :-) Reviewed-by: Olivier Goffart
| | * | Let's use engine's understanding of relative pathJoão Abecasis2010-11-252-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As much as I'd like to have the definition of "relative" be independent of custom engines, the current architecture prevents us from doing that without introducing knowledge about them in QFileSystemEntry. Fixing this specifically for resource files would be possible, but let's not break custom engines... just yet. Reviewed-by: Prasanth Ullattil
| | * | QAbstractFileEngine test caseJoão Abecasis2010-11-241-1/+1
| | | | | | | | | | | | | | | | Oops, I let a space character slip...
| | * | Smoke test for QAbstractFileEngineJoão Abecasis2010-11-245-0/+737
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tests the default file support provided by Qt, together with QFSFileEngine, QResource engine and a reference custom file engine that works on top of a simple virtual in-memory file system. For now, the test is only focusing on QFile I/O functionality, it should be extended to cover QFileInfo, QDir, QDirIterator and file system operations in QFile. The intent for the reference file engine is not to be a fully functional file system, but to ensure that minimal support for custom file engines is working. Reviewed-by: Shane Kearns
| | * | Fix compile error on WindowsPrasanth Ullattil2010-11-241-0/+4
| | | | | | | | | | | | | | | | Reviewed-by: Joao
| | * | Adding #ifdefs/#defines lost in the merge to masterJoão Abecasis2010-11-235-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file-engine-refactor moved a lot of code around. So simple merge conflict resolution didn't cut it to finish the merge. Lighthouse on OS X adds Q_WS_QPA, where we were already using QWS. Also introduced QT_NO_CORESERVICES.
| | * | Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-233245-94301/+159533
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/corelib/io/io.pri src/corelib/io/qfsfileengine.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtDeclarativeu.def src/s60installs/eabi/QtGuiu.def tests/auto/qapplication/test/test.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qdiriterator/qdiriterator.pro tests/auto/qsound/qsound.pro
| | * | | Fix QFile autotest for out-of-source buildsJoão Abecasis2010-11-221-2/+2
| | | | |
| | * | | QFileSystemEngine: remove symbian code from Unix-specific implementationJoão Abecasis2010-11-221-51/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian is not serviced by this code, anyway. So it's just dead code. Reviewed-by: Shane Kearns
| | * | | QFileSystemEngine: clean up unused codeJoão Abecasis2010-11-224-45/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolveUser/GroupName(id) only make sense on Unix platforms, there's no point in replicating them elsewhere. bundleName is a Mac-only feature, so we can otherwise merge the default implementation for other platforms. Reviewed-by: Shane Kearns
| | * | | Update QDirModel autotest (symbian)Shane Kearns2010-11-181-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip test requiring symbolic link as they aren't supported Move a Q_EXPECT_FAIL to immediately before the test function that fails (so the test result is XFAIL instead of FAIL) Reviewed-by: joao
| | * | | Fix test compile issues on symbianShane Kearns2010-11-181-3/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Fix test compile error on linuxShane Kearns2010-11-171-3/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Trust Me
| | * | | Test Coverage: add tests to cover QDir APIShane Kearns2010-11-172-4/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functional coverage of QDir, except for trivial shims for deprecated APIs and the QDebug streaming functions. Reviewed-by: joao
| | * | | Windows: fix QFile::symLinkTargetShane Kearns2010-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing return statement Reviewed-by: joao
| | * | | Test coverage: test more of QFile APIShane Kearns2010-11-171-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding tests for these functions: symLinkTarget / readLink (static & non static) permissions (static) constructors which take a QObject parent After this, all function of QFile API are tested except encoding/decoding functions and some QT3_SUPPORT inlines in the header. Reviewed-by: joao
| | * | | Fix QFile::resize on windows for files opened from a FILE*Shane Kearns2010-11-161-3/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-By: joao
| | * | | Test coverage: test QFile::resizeShane Kearns2010-11-161-0/+26
| | | | | | | | | | | | | | | | | | | | Reviewed-By: joao
| | * | | test coverage: add test for QDir::match static functionsShane Kearns2010-11-161-0/+30
| | | | | | | | | | | | | | | | | | | | Reviewed-By: joao