summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updating documentation to reflect actual behaviorJoão Abecasis2009-11-041-9/+11
| | | | | | | | QFile::seek is supposed to work on Windows CE with FILE* streams. size() returns 0 on errors and sequential files. Probably on empty files as well ;-) Reviewed-by: Olivier Goffart
* Further fixes to file size handling on Windows with fd and FILE*João Abecasis2009-11-041-17/+26
| | | | | | | | | | | | | | | filelength is not available on Windows CE instead, we must fallback to fseek/ftell as was being done previously. Still on Windows CE, we still don't report the file size for file descriptors, but we also won't set a random error string. Changed qt_error_string calls to use errno when errors come from CRT functions. Also, if we're using filelength on FILE* streams, there's no reason not to use it for file descriptors, instead of requesting a native handle. Reviewed-by: Olivier Goffart
* Turns out 64-bit fseek/ftell are not available on VS 2003/2002...João Abecasis2009-10-292-2/+9
| | | | | | | | | Not when linking dynamically to the CRT (/MT). So we can't rely on them. The declarations for those are also not on the standard headers. Reverts "(MSVC 2002/2003) Use 64-bit versions of ftell and fseek", fixes return type of QT_FTELL and skips known failures on large-file test case.
* Don't try to mmap past EOFJoão Abecasis2009-10-281-0/+6
| | | | | | | | | | On Mac OS, mmap would succeed, returning a valid pointer, but trying to read from it would result in a SIGBUS. By adding this check we commit to a safe cross-platform behavior users can depend on. Reviewed-by: Thiago Macieira
* (MSVC 2002/2003) Use 64-bit versions of ftell and fseekJoão Abecasis2009-10-271-2/+2
| | | | | | MSDN documents these as being available since Windows 95. Reviewed-by: Marius Storm-Olsen
* Define QT_OPEN_LARGEFILE on Symbian + WinCEJoão Abecasis2009-10-272-0/+2
| | | | Reviewed-by: Thiago Macieira
* Fix silly error in bit fiddlingJoão Abecasis2009-10-261-1/+1
| | | | | | | That's what I get for not having the brain on when accepting suggestions... Reviewed-by: Thiago Macieira
* Extending QFile::size test to cover files opened with fd and FILE*João Abecasis2009-10-231-8/+43
| | | | | | | Also changed tested type from int to qint64, so we'll be able to see clipping issues, although there are no large files in this test, yet. Reviewed-by: Markus Goetz
* Fix QFile::isSequential on WindowsJoão Abecasis2009-10-231-19/+10
| | | | | | | | | | | | | | | | | | When not using native HANDLEs, the return of isSequential was hardcoded to true for files with a fd, and for the standard FILE* streams stdin, stdout and stderr; false for all other FILE* streams. We now use the native GetFileType call for all files by obtaining a native handle where required. We also treat files of type FILE_TYPE_CHAR as sequential, as is the case for the standard streams in console applications. When standard streams are redirected to/from files, GetFileType will return FILE_TYPE_DISK for them and they won't be considered sequential. This is alright since in this mode they behave like regular files and QFile::seek() will work for random offsets. Reviewed-by: Marius Storm-Olsen
* Fix the LargeFile test for WindowsJoão Abecasis2009-10-231-10/+15
| | | | | | The test assumed fileName was stable, but it is documented behaviour that this can be reset when a file descriptor or FILE* stream is associated with a QFile. This was the case on Windows.
* On Windows, report a 0 file size for streams and other funny filesJoão Abecasis2009-10-231-5/+2
| | | | | | | | | | | | | | | | Obtain file size directly, instead of relying on fseek/ftell and messing with the file position. Also changed the return value on errors to 0. This is mostly relevant on streams and pipes, where we used to return whatever error value ftell returned (usually -1). This change also makes the return value consistent with what is returned on Unix platforms and what we document for Windows CE. Nevertheless, documentation of this and related issues is misleading and needs to be updated. Reviewed-by: Markus Goetz
* Check for non-zero return from fseekJoão Abecasis2009-10-231-4/+4
| | | | | | | | While POSIX specifies a -1 return on error, on Windows only non-zero is documented for error conditions. All platforms agree that zero is returned on success so we check for that instead. Reviewed-by: Markus Goetz
* Windows doesn't #define STD{IN,OUT,ERR}_FILENOJoão Abecasis2009-10-231-0/+12
| | | | Reviewed-by: Markus Goetz
* Adding a test case for large file supportJoão Abecasis2009-10-213-1/+497
| | | | | | | | The test case creates a (tentatively sparse) very large file with scattered data and uses it to test various aspects of large file support in QFile. Reviewed-by: Thiago Macieira
* Get file position when attaching an open file descriptor to QFileJoão Abecasis2009-10-212-1/+61
| | | | | | | | | | | This was already being done when attaching to FILE* streams. Doing the same here makes the API consistent and more usable. Namely, one can use QFile::pos() to obtain the file position. Test case verifies this doesn't break support for sequential files. More thorough test case included in large file support test. Reviewed-by: Thiago Macieira
* Fixes some issues with large files in 32-bit systemsJoão Abecasis2009-10-212-2/+5
| | | | Reviewed-by: Thiago Macieira
* (Windows) Don't create a file mapping for each view that is mappedJoão Abecasis2009-10-213-62/+34
| | | | | | | | | | | | | Creating a file mapping for each view mapped to memory is sub-optimal and slow. With this change, a single mapping is created and reused when mapping subsequent views of the file. The handle returned from CreateFileForMapping (used in WinCE 5) is now discarded, since the kernel manages it automatically with the file mapping. This simplifies use of the deprecated map API. Reviewed-by: Maurice Kalinowski Reviewed-by: Marius Storm-Olsen
* Fix 32/64-bit issues with QFile::map/unmap() on *nix systemsJoão Abecasis2009-10-212-11/+22
| | | | | | | | | | | | We would previously silently ignore overflows in 32-bit systems and not properly support 64-bit offsets in systems that support it because of integer overflow. There was also a problem that could prevent unmap from succeeding, because we were passing the wrong length argument. Task-number: QT-1594 Reviewed-by: Thiago Macieira
* Introducing QT_MMAPJoão Abecasis2009-10-2151-0/+81
| | | | | | | In platforms with Large File Support, we use mmap64, to be able to handle offsets (and therefore files) larger than 2Gb. Reviewed-by: Thiago Macieira
* Cleaned up the API of the Symbian event hooks.axis2009-10-2112-76/+361
| | | | | | | | | | | | | | | The two major points were: - Replacing "s60" with "symbian" in all event handling functions, since there is nothing S60-specific about them. - Replace the Symbian event types with the encapsulating QSymbianEvent container. This allows us to cope with more types of events in the future without having to add new virtual functions. AutoTest: QWidget passed Task: QT-1156 RevBy: Jason Barron RevBy: Shane Kearns RevBy: Sami Merila
* fix editable comboboxes in the Windows mobile styleJoerg Bornemann2009-10-211-31/+73
| | | | | | | | In editable QComboBoxes we used cutting-edge technology to display the text. But that's not always wanted. We actually want to see all pixels of a string like "why oh why". The lower edge was cut off. Reviewed-by: thartman
* Revert "Switch from *-armv5 to *-armv6."Frans Englich2009-10-218-17/+17
| | | | | | | | | This reverts commit a6af1538ea53408399fb29870a4ef16a92c7893a. armv6 is not supported by public SDKs, due to armv6/urel not existing. Such SDKs needs to be fixed by copying the armv5 files. Hence we revert, and postpone until we have SDKs which actually support armv6, and until we have a stronger insight into what advantages armv6 brings.
* don't remap VK_RETURN on Windows mobile if not in keypad navigation modeJoerg Bornemann2009-10-211-2/+2
| | | | Reviewed-by: TrustMe
* Fixed .make.cache write collision on symbian-sbsv2 buildsMiikka Heikkinen2009-10-211-0/+9
| | | | | | | | | | If a project was built for more than one target with single sbs command, .make.cache generation could sometime fail because multiple jobs attempted to write into it simultaneously. Now only one of the specified targets will be used to generate .make.cache, making collisions impossible. Reviewed-by: Janne Anttila
* S60Style's tab widget is too small for touch useSami Merilä2009-10-214-4/+36
| | | | | | | | | | TabWidget for S60Style is too small for touch use, it is rather hard to accurately touch the tabpane to switch the active tab. To fix this, we ask the native tabpane height from AVKON and set the QTabWiget's pane height to native height (or bigger). Task-number: QTBUG-4243 Reviewed-by: Alessandro Portale
* Switch from *-armv5 to *-armv6.Frans Englich2009-10-218-17/+17
| | | | | | | | Change from armv5 to armv6 by default. This updates documentation, the convenience scripts, and the Raptor/abld qmake generator to use armv6 instead. Task-number: QTBUG-4891 Reviewed-by: Jason Barron
* Included table for definition of plural forms for different languages.Peter Yard2009-10-211-3/+334
|
* VXWorks changes.Bill King2009-10-211-5/+24
| | | | Forward port the vxworks changes from d7b688870aead912690188b324d370b920a7a600
* Fixes: WebKit Windows CE buildBill King2009-10-211-1/+1
| | | | | | | | Details: Details: Make localtime a static function. This is needed for linking sqlite3.lib into webkit and it generally makes sense for our build of sqlite using the amalgamated build. (cherry picked from commit 5e326c74239eecbd3e64df90ebbafaf51530d43d)
* Trolltech modifications to SQLite.Bill King2009-10-211-2/+17
| | | | | | | | | | | | | | | | | | * Include <qconfig.h> and rely on Qt's QT_NO_THREAD instdead of SQLite's THREADSAFE to toggle source code releated to threading in SQLite. * compilation for Windows CE 6 While for WinCE 5 localtime is declared but not defined in the libraries, for CE 6 they are not even declared. That usually makes sense but sqlite relies on it being present in time.h. As sqlite defines their own localtime for Windows CE, we "only" need to forward declare it earlier. Conflicts: src/3rdparty/sqlite/sqlite3.c
* Update sqlite to 3.6.19Bill King2009-10-212-30056/+53754
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-10-2168-1047/+1974
|\
| * Increase PowerVR memory alignment from 8 to 32 for SGX systems.Rhys Weatherley2009-10-201-1/+1
| | | | | | | | Increasing the alignment does not seem to affect MBX.
| * Ensure qmake does not lose the error code when going over the subdirsAndy Shaw2009-10-203-7/+18
| | | | | | | | | | | | | | | | | | | | When qmake was ran with -r over a subdirs project then it would lose the error code if a later project succeeded. This is a refix of the previous revert which has been confirmed to work all over the place now. Reviewed-by: Marius Storm-Olsen
| * Fix tst_QHeaderView::length() on Symbian.Liang QI2009-10-201-1/+4
| | | | | | | | | | | | Just the default font size will not work for this case. We set it to smaller one. Notice: we should make sure view->length() is different between view->setStretchLastSection(true) and view->setStretchLastSection(false). RevBy: Aleksandar Babic
| * Introduce the QAccessibleActionInterfaceHarald Fernengel2009-10-205-2/+103
| | | | | | | | | | | | | | | | with a sample implementation for QAccessibleButton. Not implemented for all widgets yet (API is preliminary). Patch has been in the accessibility-fixes branch of qt-maemo for quite a while now without complains, thus no reviewer.
| * Implement QAccesibleValueInterface for QProgressBarHarald Fernengel2009-10-203-1/+50
| | | | | | | | | | Patch has been tested thorougly in the accessibility-fixes branch of the qt-maemo repository, thus no review
| * Assistant: Fix syntax error.ck2009-10-201-1/+1
| | | | | | | | | | The offending code is normally ifdef'ed out, so the bug did not manifest itself before.
| * Set OFN_PATHMUSTEXIT as a default parameterMartin Pejcoch2009-10-201-2/+2
| | | | | | | | | | | | | | This will result in a warning if the path entered doesn't exist, which is the behavior of native applications. Reviewed-by: Prasanth
| * Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-2043-919/+1691
| |\
| | * Windows CE gets a different paint event count than windowsninerider2009-10-201-2/+4
| | | | | | | | | | | | Reviewed-by: Joerg
| | * Test fixes for Windows Mobile.ninerider2009-10-202-96/+120
| | | | | | | | | | | | | | | | | | | | | | | | Accounting for double resolution devices on Windows Mobile in the test data sets (tst_qgraphicsview_2.cpp). Skipped a test involving mouse tracking (tst_qgraphicsview.cpp). Reviewed-by: Joerg
| | * Mac: fix bug when reparenting non-native menu barsRichard Moe Gustavsen2009-10-203-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we reparent a naive menu bar inside a widget that has a menu bar from before, the old menu bar is lost. This patch makes sure that we don't set the new menu bar in this case, but let it remain as-is in case the widget is reparanted out again later. Rev-By: MortenS
| | * Fixed QFileDialog crash on SymbianMiikka Heikkinen2009-10-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | softKeyActions QHash in QDialogButtonBoxPrivate was not kept properly in sync with standardButtonHash, causing QFileDialog to crash upon startup. Reviewed-by: Sami Merila
| | * Use premultiplied alpha pixel format in SymbianShane Kearns2009-10-2011-26/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | Gives better performance in the raster paint engine. For Symbian 9.3 onwards, this can also be used as the native pixmap format. For 9.2, conversion is required. Reviewed-by: Sami Merila Reviewed-by: Jani Hautakangas
| | * QT-693 QS60Style does not regard selection beahviors with itemviewsSami Merilä2009-10-201-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style disregards all selection behaviors for itemviews. This leads to error when showing a highlighted selection rect; rect is only shown for cell having focus. Fixed by setting the highlight to all 'selected' cells. Task-number: QT-693 Reviewed-by: Alessandro Portale
| | * changes-4.6.0 updatedJoerg Bornemann2009-10-201-0/+6
| | |
| | * Doc update for QDir::rootPath and QDir::homePath in Symbian.Janne Anttila2009-10-201-2/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-4867 Reviewed-by: Aleksandar Sasha Babic
| | * i18n: Complete German translations for 4.6.0 (XmlPatterns)Friedemann Kleint2009-10-201-317/+326
| | |
| | * Revert "Change the way we handle KeyboardUIMode on Mac"Benjamin Poulain2009-10-202-17/+7
| | | | | | | | | | | | | | | | | | This will be handled differently (QTBUG-4751) This reverts commit b12fb5861ce09539c04cd51db12a9bfbe32a4774.