summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fixed several qdoc errors.Martin Smith2009-08-281-8/+8
|
* Doc: Small change to QProcess::waitForFinished()Geir Vattekar2009-08-271-1/+2
| | | | | Task-number: 258404 Reviewed-by: Trust Me
* Merge branch 'mergeRequest' into 4.6axis2009-08-272-74/+59
|\
| * move QFSFileEngine-related symbian code from qtemporaryfile to qfsfileengineRitt Konstantin2009-08-272-5/+4
| | | | | | | | | | | | | | | | i'm a garbage collector :) AutoTest: Passed RevBy: Miikka Heikkinen Signed-off-by: axis <qt-info@nokia.com>
| * remove symbianFileName stub once and for allRitt Konstantin2009-08-271-19/+17
| | | | | | | | | | | | | | simply use ifdef to point which implementation should be compiled AutoTest: Passed Signed-off-by: axis <qt-info@nokia.com>
| * fixes and improvements made after s60 branch has been merged into masterRitt Konstantin2009-08-271-51/+39
| | | | | | | | | | | | | | | | | | | | | | * crash fixed ( d->filePath.at(0).isLetter() ) * warning removed in QFSFileEngine::copy ( unused param ) * minor optimisations * styling fixes * needless header include removed ( qregexp.h ) AutoTest: Passed Signed-off-by: axis <qt-info@nokia.com>
* | reverting the definition of WINVER and _WIN32_WINNT in qglobal.hJoerg Bornemann2009-08-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | This just caused too much problems and must be solved another way. In qfsfileengine_win.cpp we define FSCTL_GET_REPARSE_POINT and all of the other stuff that's needed for NTFS symlink support, if its not defined. This is the case if _WIN32_WINNT is less than 0x0500. All other changes in this commit are just reversions of commits that were done for the infamous qglobal.h change. Discussed with prasanth, tested by pulse.
* | Doc: Noted a limitation in using slashes in settings section names.David Boddie2009-08-261-3/+3
|/ | | | | Task-number: 254511 Reviewed-by: Trust Me
* fix warnings on Windows CEJoerg Bornemann2009-08-261-0/+2
| | | | | | | Lots of warnings in the qreal == float case. Some Q_UNUSED added. Reviewed-by: thartman
* Merge commit 'origin/master' into 4.6Jason Barron2009-08-2510-279/+297
|\
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-242-6/+4
| |\ | | | | | | | | | | | | Conflicts: src/corelib/io/qfilesystemwatcher_symbian.cpp
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-2411-205/+676
| | |\
| | * | Make the singleton file server session independent of QCoreApplicationShane Kearns2009-08-242-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After review comments, changed the file server session from a member of QCoreApplication to a Q_GLOBAL_STATIC, because some applications will want to access files before constructing the QApplication. Reviewed-By: Janne Anttila
| * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-2411-205/+676
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_unix.cpp
| * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-214-55/+42
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: src/corelib/io/qfilesystemwatcher_symbian.cpp src/corelib/io/qfilesystemwatcher_symbian_p.h
| * | | Review inspired changes to Symbian QProcessMiikka Heikkinen2009-08-212-170/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed two classes to conform to Qt conventions - Cosmetic changes. Reviewed-by: Janne Koskinen
| * | | Review inspired changes to Symbian file system watcherMiikka Heikkinen2009-08-212-55/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added retry to failed notification request. - Removed superfluous New method. - Cosmetic changes. Reviewed-by: Janne Koskinen
| * | | Review inspired fixes to Symbian file engineMiikka Heikkinen2009-08-216-50/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactored symbian specific public method out of qfsfileengine.h into a static method. - Utilized PathInfo class for getting home, root, and temp paths. - Cosmetic changes. Reviewed-by: Janne Koskinen
* | | | Reset dangling handle after close on WinCE 5João Abecasis2009-08-241-0/+3
| | | | | | | | | | | | | | | | Reviewed-by: Maurice Kalinowski
* | | | Always check the file handle before attempting to map the fileJoão Abecasis2009-08-241-5/+8
| | | | | | | | | | | | | | | | Reviewed-by: Maurice Kalinowski
* | | | QFSFileEngine: Don't close file if we already have a file for mappingJoão Abecasis2009-08-241-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Maurice Kalinowski
* | | | QFSFileEngine compile fix for NTFS symlink supportJoerg Bornemann2009-08-241-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also reverts my panic compile fixes, which just disabled the symlink code paths on Windows. This reverts commit e5fe8b49b08a6e749bde8581d9267ddafa7c9990. This reverts commit 7385c1fc7fe03836ed42cc783e840557d267cff9.
* | | | Don't access usedHashFunc() if it's already been deleted.Thiago Macieira2009-08-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem spotted in Designer: ==13197== Invalid read of size 4 ==13197== at 0x5C9AD2A: QHash<QString, QConfFile*>::isEmpty() const (qhash.h:283) ==13197== by 0x5C98142: QHash<QString, QConfFile*>::remove(QString const&) (qhash.h:769) ==13197== by 0x5C8C9FF: QConfFile::~QConfFile() (qsettings.cpp:226) ==13197== by 0x5C9238E: QConfFileSettingsPrivate::~QConfFileSettingsPrivate() (qsettings.cpp:1228) ==13197== by 0x5C9D7AA: QScopedPointerDeleter<QObjectData>::cleanup(QObjectData*) (qscopedpointer.h:62) ==13197== by 0x5CF11A4: QScopedPointer<QObjectData, QScopedPointerDeleter<QObjectData> >::~QScopedPointer() (qscopedpointer.h:100) ==13197== by 0x5CE9B46: QObject::~QObject() (qobject.cpp:992) ==13197== by 0x5C95C90: QSettings::~QSettings() (qsettings.cpp:2754) ==13197== by 0x5CC1FDC: LibraryData::~LibraryData() (qlibrary.cpp:428) ==13197== by 0x5CC2441: QGlobalStaticDeleter<LibraryData>::~QGlobalStaticDeleter() (qglobal.h:1767) ==13197== by 0x5FE16DE: __run_exit_handlers (exit.c:78) ==13197== by 0x5FE174E: exit (exit.c:100) ==13197== by 0x5FCBA3D: (below main) (libc-start.c:252) ==13197== Address 0x0 is not stack'd, malloc'd or (recently) free'd
* | | | QFSFileEngine compile fix for VS2005Joerg Bornemann2009-08-211-1/+1
| | | | | | | | | | | | | | | | Last change wasn't enough...
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-211-1/+1
|\ \ \ \
| * | | | QFSFileEngine compile fix for Windows with VS2005Joerg Bornemann2009-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | | Merge branch 'master' of git@scm:qt/qt-s60-publicaxis2009-08-2132-123/+1921
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | This brings support for the S60 platform into Qt.
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-214-79/+189
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_unix.cpp src/corelib/plugin/qlibrary.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-219-126/+487
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess.h
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-201-1/+1
| |\ \ \ \
| | * \ \ \ Merge commit 'qt/master'Jason Barron2009-08-201-1/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/painting/svgviewer/files/bubbles.svg src/corelib/kernel/qobject.cpp src/network/kernel/qhostinfo.cpp tests/auto/qhostinfo/tst_qhostinfo.cpp
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-204-3/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-191-0/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/auto.pro
| | * | | | | Changed names and URLs to reflect name change.axis2009-08-193-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| * | | | | | performance: refactored use of RFs so corelib and gui share one sessionShane Kearns2009-08-203-54/+41
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opening and closing sessions has a performance impact on Symbian, so all users of RFs now share a single session. If a native file engine is written for Symbian (instead of the posix one currently in use) then that could own the global data instead of QCoreApplication. Task-number: 247617 Reviewed-by: jbarron
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-182-12/+21
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-181-3/+4
| | |\ \ \ \ \
| | * | | | | | Fixes to Symbian native engine for QFileSystemWatcher.Shane Kearns2009-08-182-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wrong version of cancel was used, resulting in all filesystem notifications being cancelled when one path was removed from the engine. For directory notifications, changed ENotifyAll to ENotifyEntry to reduce the spurious directory changed notifications which come from file modifications within that directory. On Symbian OS, opening a file for overwrite (truncate mode in Qt terms) will cause a directory change notification, the OS considers it to be the same type of event as creating a new file for the first time. Other platforms presumably do not have this behaviour otherwise the auto test would fail there as well. Reviewed-by: miikka heikkinen
| * | | | | | | Merge commit 'qt/master'Jason Barron2009-08-1817-165/+129
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples.qdoc doc/src/plugins-howto.qdoc doc/src/topics.qdoc examples/phonon/musicplayer/mainwindow.cpp src/3rdparty/freetype/src/base/ftobjs.c src/corelib/global/qglobal.h src/corelib/tools/qalgorithms.h src/corelib/tools/qshareddata.cpp src/corelib/tools/qsharedpointer.cpp src/corelib/tools/tools.pri src/corelib/xml/qxmlstream.h src/gui/painting/painting.pri src/gui/widgets/qdatetimeedit.cpp tests/auto/qdesktopservices/qdesktopservices.pro tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qtextcodec/test/test.pro
| * | | | | | | Fixed merge failure in qfsfileengine_unix.cpp.Miikka Heikkinen2009-08-141-3/+4
| | |/ / / / / | |/| | | | |
| * | | | | | Fix compilation of unix file engine.Jason Barron2009-08-131-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a bracket to the right place and re-arrange the code a little. The indenting was wrong here in the non-Symbian case since the if (exists) did not have curly bracket. Also copy the union of the Hidden flag into the Symbian #ifdef to make this code slightly more readable.
| * | | | | | Merge commit 'qt/master'Jason Barron2009-08-1369-224/+227
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * | | | | | | s/class/struct/Harald Fernengel2009-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop confusing MSVC by correctly forward declare QScopedPointerDeleter as struct
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-101-1/+11
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-08-101-1/+11
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| * | | | | | | | | moved declaration of engine to better match merge and to remove warningmread2009-08-101-1/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-0746-1676/+1974
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts fixed: src/corelib/io/qdiriterator.cpp
| | * | | | | | | | Update license headers according to commit 858c70f768e.axis2009-08-063-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | | | | | Replaced $MODULE$ with hardcoded module names.axis2009-08-063-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | | | | | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-0615-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rationale: We're using template magic now to get the private pointer in qglobal.h, so no need to have two macros. Also keeps backward compatibility with outside (KDE) code.
generated by cgit v0.12 at 2025-09-03 12:50:41 (GMT)