summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed qfilesystemmodel autotestmread2011-02-101-1/+5
| | | | | | | | | | | | The qfilesystemmodel autotest was failing on Symbian devices where there were bad drives. These do not appear in the file system model root list, but do appear in QDir::drives, giving different results. The test now filters the bad drives out of the drives list before comparing the counts. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* tst_qfileopenevent changed to run on all platformsmread2011-02-102-35/+86
| | | | | | | | The Symbian specific bits are hidden behind #ifdef, but most of this test is valid on all platforms now. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* Started move of QFileOpenEvent autotest to genericmread2011-02-107-2/+3
| | | | | | | | | The QFileOpenEvent autotest was written as Symbian specific. But it is going to be modified to be applicable to all platforms. So this is the file move to reflect that change. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* Updates after review commentsmread2011-02-103-6/+14
| | | | | | | | | Tidied up QFileOpenEventPrivate destruction. Commented the Duplicates to explain their benefit. Remove the file exists check from ProcessCommandParametersL Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* review improvements for QFileOpenEvent changesmread2011-02-101-12/+11
| | | | | | | | removed an unnecessary local QString Improved some comment wording Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* added qfileopenevent test to the symbian testsmread2011-02-101-1/+1
| | | | | | | Previously it had not been added to the symbian tests .pro file Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* removed dodgy file headermread2011-02-101-9/+0
| | | | | | | | | The comment block at the top of the file had tabs in it. Git didn't like that. It's now removed, it was just the default comment added by Carbide. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* renamed .pro file to make qmake happymread2011-02-101-0/+0
| | | | | | | qmake got upset because tst_qfileopenevent.pro was not called test.pro. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* Development of QFileOpenEvent testing for Symbianmread2011-02-105-16/+191
| | | | | | | | | | The source has been rearranged so that there is a main test program and a helper app, which helps test data caging. A bunch of new tests have been added. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* Started a QFileOpenEvent test for Symbianmread2011-02-102-0/+194
| | | | | | | | | | | This is an autotest for QFileOpenEvent. Actually it's more generic than just Symbian. So maybe it will move out of the Symbian specific directory in the future. This autotest is not complete yet. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* removed double forward declarationmread2011-02-101-4/+0
| | | | | Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* Fixed a trailing whitespacemread2011-02-101-1/+1
| | | | | Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* Using QFile open by RFile and take ownership of handlemread2011-02-106-18/+48
| | | | | | | | | | QFileOpenEvent's open method now opens the QFile with an RFile handle if possible. It takes a duplicate of the handle and transfers ownership to the QFile, so that the QFile can be used many times and outside of the lifetime of the QFileOpenEvent. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* Added a file handle to QFileOpenEvent on Symbianmread2011-02-102-4/+4
| | | | | | | | | | | | | | | | QFileOpenEvent needs to tell the recipient what file to open. Normally that is by filename. But on Symbian, some files can only be opened from an already-open file handle that has been passed in. For example data caged files in c:\private or z:\sys. So QFileOpenEvent needs to be able to hold a Symbian file handle so that the recipient can access any file requested of it. Coming soon... a method by which the reciever can access the file without knowing about all this messy file handle stuff going on behind the scenes. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* used official descriptor to QString conversionmread2011-02-101-1/+1
| | | | | | | | The OpenFileL code now uses qt_TDesC2QString to convert from the TFileName to a QString. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* Generating QFileOpenEvent messages when S60 UI receives OpenFileLmread2011-02-101-2/+4
| | | | | | | | | | | | | | | S60 applications can receive OpenFileL requests from other apps in the OpenFileL method of their main document class. This S60 main document class is internal to QtGui, so the request is turned into a QFileOpenEvent for the application to pick up if it want to implenment this service. If an application wants to receive the QFileOpenEvent before UI construction, it should do something like: app->sendPostedEvents(app, QEvent::FileOpen); Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* documentation for QFileOpenEvent::openFilemread2011-02-101-0/+11
| | | | | Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* added an openFile method to QFileOpenEventmread2011-02-102-0/+16
| | | | | | | | | | | An application needs some way to get an open QFile when a QFileOpenEvent contains a Symbian file handle. Rather than exposing that file handle and forcing platform specific code to the application, this method hides the details giving an effective universal method for turning a QFileOpenEvent into an open QFile. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* Added a file handle to QFileOpenEvent on Symbianmread2011-02-104-13/+46
| | | | | | | | | | | | | | | | QFileOpenEvent needs to tell the recipient what file to open. Normally that is by filename. But on Symbian, some files can only be opened from an already-open file handle that has been passed in. For example data caged files in c:\private or z:\sys. So QFileOpenEvent needs to be able to hold a Symbian file handle so that the recipient can access any file requested of it. Coming soon... a method by which the reciever can access the file without knowing about all this messy file handle stuff going on behind the scenes. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* used official descriptor to QString conversionmread2011-02-101-2/+3
| | | | | | | | The OpenFileL code now uses qt_TDesC2QString to convert from the TFileName to a QString. Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* Generating QFileOpenEvent messages when S60 UI receives OpenFileLmread2011-02-103-3/+28
| | | | | | | | | | | | | | | S60 applications can receive OpenFileL requests from other apps in the OpenFileL method of their main document class. This S60 main document class is internal to QtGui, so the request is turned into a QFileOpenEvent for the application to pick up if it want to implenment this service. If an application wants to receive the QFileOpenEvent before UI construction, it should do something like: app->sendPostedEvents(app, QEvent::FileOpen); Task-number: QTBUG-15015 Reviewed-by: Shane Kearns
* Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-02-10366-1742/+15347
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (182 commits) Fixes XPASS Revert part of commit 7c1ab9b6a8 Fixed wrong casing of a Symbian library. Fixed wrong static library extension on Symbian. Fixed library casing. Remove dependencies to pre-Symbian3 platforms from Symbian3 packages My changes 4.7.2 Don't accept input methods when a TextEdit or TextInput is read only. Correct error message On windows xp using a higher port makes the declarativedebug* tests work Correct assert Fix qt.sis platform dependencies for Symbian^3 builds. Fix few QFileDialog static method issues in Symbian^3 Update QDeclarative DEF files for Symbian Export QDeclarativeRefCount so that symbian compiles. Make Flickable's wheel handling more like QAbstractScrollArea. Changing header or footer failed to delete the previous. Avoid index-out-of bounds related crash in Grid Move Qt.application docs into Qt global object page Add initial size to ListView in FolderListModel example ...
| * Fixes XPASSOlivier Goffart2011-02-091-1/+0
| |
| * Revert part of commit 7c1ab9b6a8Olivier Goffart2011-02-094-40/+5
| | | | | | | | | | | | | | It was not properly merged in master because of conflicts, and we have now a public API for this Added QEXPECT_FAIL and opened QTBUG-17325
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-04367-1744/+15385
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/samegame/SamegameCore/samegame.js mkspecs/features/symbian/default_post.prf src/declarative/qml/qdeclarativeengine.cpp src/gui/text/qtextdocumentlayout.cpp src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/s60installs.pro tests/auto/declarative/declarative.pro tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp tests/auto/declarative/qmlvisual/qmlvisual.pro
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-049-23/+25
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed wrong casing of a Symbian library. Fixed wrong static library extension on Symbian. Fixed library casing. Remove dependencies to pre-Symbian3 platforms from Symbian3 packages Fix qt.sis platform dependencies for Symbian^3 builds. Fix few QFileDialog static method issues in Symbian^3 Make emulator deployment depend on post linking in symbian-sbsv2.
| | | * Fixed wrong casing of a Symbian library.axis2011-02-031-1/+1
| | | | | | | | | | | | | | | | RevBy: Trust me
| | | * Fixed wrong static library extension on Symbian.axis2011-02-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit a1ba5568da6c57e, which moved the extension definitions from the symbian-makefile.conf to symbian.conf, the QMAKE_EXTENSION_STATICLIB was wrong because unix.conf was included later and overwrote it. Turns out we don't need unix.conf, so I just removed it. RevBy: Trust me
| | | * Fixed library casing.axis2011-02-031-1/+1
| | | | | | | | | | | | | | | | RevBy: Trust me
| | | * Remove dependencies to pre-Symbian3 platforms from Symbian3 packagesMiikka Heikkinen2011-02-032-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt applications built against Symbian3 SDK will not run on older devices, so remove the platform dependency to those devices so that the user will get a proper warning if he tries to install incompatible software to an older device. Task-number: QTBUG-17187 Reviewed-by: Janne Koskinen
| | | * Fix qt.sis platform dependencies for Symbian^3 builds.Miikka Heikkinen2011-02-021-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian^3 build of qt.sis is not compatible with pre-Symbian^3 devices, so remove the platform dependencies to said devices. Task-number: QTBUG-17150 Reviewed-by: Janne Koskinen
| | | * Fix few QFileDialog static method issues in Symbian^3Miikka Heikkinen2011-02-022-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The selected file path now uses slashes instead of Symbian native backslashes as directory separator. - If default file is specified in dir parameter of getSaveFileName in addition to directory, that will be used as default suggested filename. - Clarified documentation a bit. Task-number: QTBUG-17135 Reviewed-by: Janne Koskinen
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-022-4/+6
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Make emulator deployment depend on post linking in symbian-sbsv2.
| | | | * Make emulator deployment depend on post linking in symbian-sbsv2.Miikka Heikkinen2011-01-312-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post linking output was not previously possible to deploy as there was no dependency from deployment to post linking, which meant deployment was usually attempted first. Now all post linking in project tree needs to be done before any deployment is done. Note that you can still get warnings about missing dependencies as sbsv2 checks those before it actually executes the targets. These warnings are harmless, but difficult to get rid of using a general solution, as qmake cannot make any guesses what QMAKE_POST_LINK handling might output. Task-number: QTBUG-17037 Reviewed-by: axis
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-03362-1719/+15385
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (172 commits) Don't accept input methods when a TextEdit or TextInput is read only. Correct error message On windows xp using a higher port makes the declarativedebug* tests work Correct assert Update QDeclarative DEF files for Symbian Export QDeclarativeRefCount so that symbian compiles. Make Flickable's wheel handling more like QAbstractScrollArea. Changing header or footer failed to delete the previous. Avoid index-out-of bounds related crash in Grid Move Qt.application docs into Qt global object page Add initial size to ListView in FolderListModel example update What's New for QtQuick 1.1 and AnimatedImage docs Improve docs on Item::visible and Item::opacity Make sure we update Loader size if item size changes after creation. Froze two more symbols and fixed compilation error (QtQuick11). PinchArea sometimes failed. Froze Symbian def files for QtQuick11. Clarify that IntValidator performs locale specific validation. Add a mouseSelectionMode property to TextEdit and TextInput. Add missing versioning tests for new QtQuick 1.1 properties/methods. ...
| | | * | | Don't accept input methods when a TextEdit or TextInput is read only.Andrew den Exter2011-02-034-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Neither would open a software input panel or allow text entry while read only, but on Symbian at least the text input mode indicator was still displayed giving the appearance of being able to enter text. Task-number: QT-4497 Reviewed-by: Damian Jansen
| | | * | | Correct error messageAaron Kennedy2011-02-031-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17091
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2011-02-031-2/+1
| | | |\ \ \
| | | | * | | Correct assertAaron Kennedy2011-02-031-2/+1
| | | | | | |
| | | * | | | On windows xp using a higher port makes the declarativedebug* tests workMartin Jones2011-02-032-6/+6
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I know not why... Reviewed-by: Aaron Kennedy
| | | * | | Update QDeclarative DEF files for SymbianKalle Juhani Lehtonen2011-02-022-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2011-02-023-2/+62
| | | |\ \ \
| | | | * | | Make Flickable's wheel handling more like QAbstractScrollArea.Michael Brasser2011-02-023-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vertical scrolling should only affect vertical movement, and horizontal scrolling should only affect horizontal movement. Task-number: QTBUG-7369 Reviewed-by: Martin Jones
| | | * | | | Export QDeclarativeRefCount so that symbian compiles.Martin Jones2011-02-021-1/+1
| | | |/ / /
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-02359-1710/+15273
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (165 commits) Changing header or footer failed to delete the previous. Avoid index-out-of bounds related crash in Grid Move Qt.application docs into Qt global object page Add initial size to ListView in FolderListModel example update What's New for QtQuick 1.1 and AnimatedImage docs Improve docs on Item::visible and Item::opacity Make sure we update Loader size if item size changes after creation. Froze two more symbols and fixed compilation error (QtQuick11). PinchArea sometimes failed. Froze Symbian def files for QtQuick11. Clarify that IntValidator performs locale specific validation. Add a mouseSelectionMode property to TextEdit and TextInput. Add missing versioning tests for new QtQuick 1.1 properties/methods. Use qobject_cast rather than dynamic_cast. expect fail for some PinchArea tests on mac Allow functions to be passed in as values for grouped properties Fix lineHeight autotests. Update Docs, Examples and Demos for new CreateObject overloadable Adding support for group properties in Component::CreateObject() Update test, versioning is fixed so expect-fail no longer needed ...
| | | | * | Changing header or footer failed to delete the previous.Martin Jones2011-02-028-1/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also ensure that the view is repositioned if the change of header results in the view being out of bounds. Task-number: QTBUG-16522 Reviewed-by: Michael Brasser
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2011-02-0215-83/+182
| | | | |\ \
| | | | | * | Move Qt.application docs into Qt global object pageBea Lam2011-02-024-61/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was documented as a separate 'Application' element Reviewed-by: Martin Jones
| | | | | * | Add initial size to ListView in FolderListModel exampleBea Lam2011-02-022-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus other minor doc changes
| | | | | * | update What's New for QtQuick 1.1 and AnimatedImage docsBea Lam2011-02-022-4/+23
| | | | | | |