summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-082-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: A few trivial optimizations Rewrote bookmark handling, the previous code was just plain awful. Small style cleanup. Fix some warnings. Designer: Emit QDesignerPropertyEditorInterface::propertyChanged(). Designer: Support the 'windowOpacity'-property for forms. Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".." Assistant: Treat "unfiltered" filter in a apecial way. Assistant: Give meaningful context to translations. Fixed handling of paths containing ".." in QFileSystemModel on Windows. QAbstractItemModel docs: Fix typo. Assistant: Eliminate private tr contexts.
| * A few trivial optimizationsThorbjørn Lindeijer2010-02-052-2/+2
| | | | | | | | | | | | Don't use QHash/QMap::values/keys unnecessarily. Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-041-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use a shared QScriptEngine for debugger console command scripts Fix QtScript debugger hang/crash issue with updating locals model doc: Fixed some qdoc warnings. Always activate popup windows on show doc: Fixed some qdoc warnings. Add the QMAKE_FILE_EXT variable to extra compilers generation. Cocoa: Tool Windows steal focus from the main window qdoc3: Removed a debug output. Update QTestLib documentation with chart use case.
| * | doc: Fixed some qdoc warnings.Martin Smith2010-02-041-0/+1
| | |
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-043-19/+26
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-021-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant examples: Fix missing QLatin1String. Added Czech translations. Webkit: Fix missing namespace. qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN qmake: fix warnings qmake: Remove macro and simplify string expression previously using it qmake: use isActiveConfig() instead of hand-crafting comparisons Fix missing namespace. Assistant: Fix spelling mistakes. Assistant: Use const references in foreach loops. optimization: get rid of QString::fromUtf16() usage document QString::fromUtf16() slowness remove duplicated calculation of length remove pointless conditionals micro-optimization optimize qhash() Designer/uic/related examples: Fix source code scanning issues II.
| | * | optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly pointless when converting internal data structures which are raw utf16 in host byte order anyway. so replace it with QString::fromRawData() (for short-lived strings) or QString(const QChar *, int) (otherwise) if possible. Reviewed-by: axis Reviewed-by: mariusSO Reviewed-by: Bill King
| * | | Fixed no-timeout case for QProcess::waitForFinished in SymbianMiikka Heikkinen2010-02-011-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QProcess::waitForFinished was panicking in Symbian when timeout of -1 was supplied. Fixed it to disable timeout and block until process exit, as docs indicate it should. Task-number: QTBUG-7667 Reviewed-by: Janne Anttila
| * | | Catch by reference rather than by valueIain2010-02-011-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Catching by value causes GCC to use the compiler support function __cxa_get_exception_ptr. This is not available in the compiler support libraries on Symbian OS prior to Symbian^3. Catching by reference avoids this problem. Reviewed-by: mread
* | | QDir fix issues with (shared) cached listsJoão Abecasis2010-02-031-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With 2964718224c0ed356511335742368d4fc421c6bd, QDir started really using the cached file lists. However, these were not being properly updated on setNameFilters, setFilter and setSorting. QDir::refresh, on the other hand, would invalidate the lists without first detaching, thus breaking the copy-on-write promise. Summarizing, shared data must be detached and cached lists invalidated, so they get regenerated. Reviewed-by: Olivier Goffart Reviewed-by: Ritt Konstantin
* | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-013-21/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | Core classes, examples, demos: Some changes from string to charMarkus Goetz2010-01-281-1/+1
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-281-1/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (70 commits) doc: Fixed the last qdoc errors. doc: Document the "Type" enum value as a const in variable. Designer: Add lower/raise to context menu. Compile with no-webkit - add missing semi-colons. Fixes visibility update missing when doing setParentItem on graphicsitem Stabilize tst_QGraphicsScene::polishItems2 (new test) Fixed an infinite loop that could occur when reading invalid BMP images. Updated docs regarding QGLWidget::renderText() limitations. Added optimization flag to QGraphicsItemPrivate. Fixed child items with graphics effects not inheriting opacity. Made the trace replayer handle limited resolution cases better. Small optimization in raster paint engine. Another ASSERT while deleting spans Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. ...
| | * | Autotest: add a test for allowing hostnames ending in dotThiago Macieira2010-01-221-1/+1
| | | | | | | | | | | | | | | | Also, since domain is never empty, the idx > 0 test is unnecessary.
| | * | Fix QUrl::toAce for domains with dot at endThorvald Natvig2010-01-221-1/+4
| | | | | | | | | | | | | | | | | | | | Merge-request: 436 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | Fix QSettings default paths not being initialized when setPath() is calledDaniel Molkentin2010-01-271-19/+25
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only coincidently worked on Linux, because it creates a QSettings object to read system settings before any user data was executed, thus initializing the static default path data. However, if only the SystemPath was modified, the UserPath never got initialized on non-Linux platforms, causing settings for the users below $PWD. Also, it removes unncessary checks and mutex locks, which should give a slight speed up. Reviewed-By: dt
* | | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-0114-424/+529
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc src/gui/dialogs/qfiledialog_win.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * | | Use X/Open LFS extensions for 64-bit support on directory iterationJoão Abecasis2010-01-292-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This boils down to using readdir64(_r) and struct dirent64 where available. I assumed these are available in the same platforms other such extensions are already being used. AIX uses the additional type DIR64 and opendir64/closedir64 to manipulate it. Task-number: QTBUG-2781 Reviewed-by: Thiago Macieira
| * | | nano-optimizationsRitt Konstantin2010-01-291-10/+4
| | | | | | | | | | | | | | | | | | | | Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | code cleanup and styling fixesRitt Konstantin2010-01-292-159/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove trailing whitespaces * tabs -> whitespaces * "if(" -> "if (" * "while(" -> "while (" * "for(" -> "for (" * "for (int i.*; i++)" -> "for (int i.*; ++i)" /* looks better ;) */ * minor doc fixes Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | QDirPrivate: remove unused q_ptr and Q_DECLARE_PUBLICRitt Konstantin2010-01-291-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update constructor signatures; both private and protected members became public. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | QDir: clear internal file lists cache earlyRitt Konstantin2010-01-291-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the cache was invalidated (setPath, refresh, detach, etc.) then there is no sense to keep it any longer. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | QDirPrivate::setPath: always initialize the file engineRitt Konstantin2010-01-291-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDir::isRelativePath() would construct a temporary file engine just to check if we could reuse the existing one. This was also making assumptions about the inner workings of the engine, that might not be valid outside QFSFileEngine. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | optimize QDir::cd()Ritt Konstantin2010-01-291-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already create a file engine for testing if dir exists. We can also use it as source for current QDir. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | QDirPrivate::Data: remove needless clear()-s in constructorsRitt Konstantin2010-01-291-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize members with default values in constructor, instead. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | QDir::cleanPath: strip trailing slash for "/:/" on non-win platformsRitt Konstantin2010-01-291-3/+6
| | | | | | | | | | | | | | | | | | | | Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | QDir::entry(Info)List(): really use cached dataRitt Konstantin2010-01-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test conditions for using cached file lists were wrong and preventing list reuse unless no filters or sorting flags were previously set. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | Fix QDir::operator[] documentationRitt Konstantin2010-01-291-4/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | Fix regressions introduced in 3a5eb87965b60a3e249a16dc48cb06f4759dfb1bJoão Abecasis2010-01-271-10/+10
| | | | | | | | | | | | | | | | Caching of LinkType and BundleType is independent of other file flags.
| * | | Whitespace cleanupRitt Konstantin2010-01-261-68/+18
| | | | | | | | | | | | | | | | | | | | Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | cleanups & styling fixesRitt Konstantin2010-01-261-47/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `if(' -> `if (' `for(' -> `for (' remove needless qhash.h include Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | QFileInfo: Implement additional caching of FileOwner stringsRitt Konstantin2010-01-262-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce overhead of the uid/gid to user/group name conversion by caching results from QAbstractFileEngine::owner(). Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | qfileinfo_p.h: removed unnecessary dependency on QFSFileEngineRitt Konstantin2010-01-262-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved includes into proper place. Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | Simplify QFileInfoPrivate::getFileTimeRitt Konstantin2010-01-261-18/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | remove repeated code; improve readability Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | QFileInfo: Don't re-stat files, when in caching modeRitt Konstantin2010-01-262-32/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separated testing for permissions flags, in order to speedup QFileInfo on Windows with qt_ntfs_permission_lookup flag turned on (especially on network shares). In QFileInfoPrivate::getFileFlags, avoid multiple calls to the engine, by concatenating all requests. Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | QFileInfoPrivate::Data: don't call clear() from constructorsRitt Konstantin2010-01-261-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causes Refresh of file engine's internal cache, since `fileEngine' member is set before clear() is called. Initialize members with default values instead. Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | fix regression introduced in 44766d2Ritt Konstantin2010-01-261-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | null fileNames returned by fileEngine must be cached too Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | Merge branch '4.6'Thiago Macieira2010-01-211-53/+50
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * \ \ Merge branch '4.6'Thiago Macieira2010-01-182-2/+6
| |\ \ \
| * \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1373-143/+267
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | | | | add a hash function to QUrl, and remove the xmlpatterns specific onePeter Hartmann2010-01-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we had a hash function defined in xmlpatterns; this commit adds a global hash function for QUrls. Beware that code that defines its own hash function for QUrls will need to #ifdef it out for 4.7. Patch-By: Warwick Allison Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira
| * | | | | Merge branch '4.6'Thiago Macieira2010-01-082-5/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-053-14/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-264-7/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * | | | | | | | fix small leftovers from the Win9x removal in the codeminiak2009-12-221-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LoadLibraryW -> LoadLibrary RegOpenKeyExW -> RegOpenKeyEx qdesktopservices_win.cpp: buffer size fixed in launchWebBrowser() Windows NT 4.0 version condition removed Merge-request: 1627 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | | | | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-151-1/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * | | | | | | | | Re-enabled support for the FSEvents-based QFileSystemWatcher.Denis Dzyubenko2009-12-092-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed it to use canonicalFilePath instead of absoluteFilePath since when we get notification from the system, it gives us the canonical path with resolved symlinks (for example when watching for /tmp, the notification that we get says that /private/tmp was modified). Reviewed-by: Prasanth
| * | | | | | | | | Implemented getting a canonical file name on Mac OS X 10.5Denis Dzyubenko2009-12-091-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using FSRef to get a canonical file path on OS X 10.5 which doesn't support realpath(X,0) extension. Reviewed-by: Prasanth
| * | | | | | | | | Use realpath only on OS we know it works on.Denis Dzyubenko2009-12-091-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As far as we know realpath(X,0) extenstion is only supported on Linux, Mac OS X starting with 10.6 and on Symbian. Here goes the trick: realpath() on Mac properly handles file systems case-sensitivity, meaning two files with different cases will are the same file if the file system is case insensitive (which is the default on Mac). However the QFSFileEngine will still say that the file system is case sensitive because on Mac you can have several drives with different file systems (with different case sensitivity), and QFSFileEngine doesn't allow to return different values depending on the file path, so we still say that the file system is case-sensitive, which is the safiest behavior. This changes the behavior on Mac, but changes it to be correct. Reviewed-by: Markus Goetz Reviewed-by: João Abecasis
| * | | | | | | | | Merge branch '4.6'Thiago Macieira2009-12-024-19/+42
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
generated by cgit v0.12 at 2025-08-30 23:20:14 (GMT)