summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ListModel::get() should return undefined if bad index specifiedBea Lam2010-05-132-11/+21
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1395-226/+611
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-13135-1216/+2470
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (34 commits) Fix TextEdit and TextInput input panel support for mode RSIP_OnMouseClickAndAlreadyFocused Fix for graphics widget in the background stealing declarative item's focus Fix broken benchmarks. Possibly fix autotest Correctly assign bool to variant properties Improve Image docs. Move all fillMode image examples to fillMode Flickable small API changes. Reset the dragDropItem to 0 when the item dies while dragging on top it. Avoid warning (and possible future crash) upon reload. Don't pass sequential (QNetworkReply) to image reader, it doesn't work well enough. Stop GIF handler claiming it can report Size for sequential devices, Use raster graphicssystem for qml.app on OS X. Add missing test, qdeclarativelayoutitem, to declarative.pro Sorted the tests list in declarative.pro Bail out early if the same target value is reassigned to a Behavior. Correctly position any input method popups for TextInput. Correctly resize TextInput in the presence of preedit text. Apply signal handler changes immediately. Remove unused image Qt.widgets was removed, point to graphics layouts example ...
| | * Fix TextEdit and TextInput input panel support for mode ↵Joona Petrell2010-05-137-17/+40
| | | | | | | | | | | | | | | | | | | | | RSIP_OnMouseClickAndAlreadyFocused Task-number: Reviewed-by: Warwick Allison
| | * Fix for graphics widget in the background stealing declarative item's focusJoona Petrell2010-05-133-2/+59
| | | | | | | | | | | | | | | Task-number: QTBUG-10584 Reviewed-by: Warwick Allison
| | * Fix broken benchmarks.Michael Brasser2010-05-138-30/+27
| | |
| | * Possibly fix autotestAlan Alpert2010-05-121-1/+1
| | | | | | | | | | | | | | | It's unclear why the autotest failed on a platform I can't test on right now, but this might clear it up.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-12117-1166/+2341
| | |\
| | * | Emit numFlagsChangedAlan Alpert2010-05-111-0/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-10552
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-1275-176/+482
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (24 commits) Provide a way to specify the final sis name with createpackage/make sis Update DEF files for Qt 4.7 Symbian/trk: Fix debugging output for the N8. Add license header Fix slider stepping when used with keypad navigation fix webkit crash when accessing network on Symbian Remove test cases which cause stack overflow Fix compile errors Run autotests with minimal capabilities Documentation updates for Qt/Symbian on Linux development Allow EPOCROOT env var to be without trailing slash. Workaround for Symbian Open C bug in socket connect. Fix fetchedRoot test variable to work also in Symbian Add configure time checks for symbian environment Check for existance of sis file parameter to runonphone Fix thread synchronization issues in Symbian QFileSystemWatcher Disable compiling of the plugin when extra package not found Added missing UID3 for qsymbianbearer.dll. Enabled previously disabled Qt features. Fix includes so it compiles ...
| | * | | Provide a way to specify the final sis name with createpackage/make sisMiikka Heikkinen2010-05-122-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The -n parameter can be used to specify the final sis name when using createpackage script or "make sis" with QT_SIS_OPTIONS. Task-number: QTBUG-9400 Reviewed-by: Janne Koskinen
| | * | | Update DEF files for Qt 4.7Shane Kearns2010-05-116-41/+129
| | | | | | | | | | | | | | | | | | | | | | | | | Task-Number: QTBUG-10251 Reviewed-by: Trust Me
| | * | | Symbian/trk: Fix debugging output for the N8.Shane Kearns2010-05-113-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix hanging behaviour when we receive a message on the wrong mux in framed mode 2. Treat messages on the trace mux (0102) as debug output 3. Separate timestamp from text in trace messages Reviewed-by: Friedemann Kleint
| | * | | Add license headerThomas Zander2010-05-111-0/+40
| | | | |
| | * | | Fix slider stepping when used with keypad navigationMiikka Heikkinen2010-05-111-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QElapsedTimer usage was corrected Task-number: QTBUG-9857 Reviewed-by: Alessandro Portale
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-05-11372-3583/+7106
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-1162-117/+239
| | | |\ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove test cases which cause stack overflow Fix compile errors Run autotests with minimal capabilities Documentation updates for Qt/Symbian on Linux development Allow EPOCROOT env var to be without trailing slash. Workaround for Symbian Open C bug in socket connect. Fix fetchedRoot test variable to work also in Symbian Add configure time checks for symbian environment Check for existance of sis file parameter to runonphone Fix thread synchronization issues in Symbian QFileSystemWatcher Disable compiling of the plugin when extra package not found Added missing UID3 for qsymbianbearer.dll. Enabled previously disabled Qt features. Fix includes so it compiles Use lowercase includes so it compiles in Linux too Fixed library dependency for Gnupoc. Removed the --export_all_vtbl from linking. Cleaned up the elf2e32 options a bit.
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-11372-3583/+7106
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (144 commits) Correct Flipable back item based on parent, not scene transform Round ideal width up to prevent incorrect word wrapping on Mac OS X Correct ownership of signal handlers in state changes. Remove unnecesary check for debug output. Error message on QWS appears to have changed. Removed multimedia effects from tvtennis declarative example Add some test asserts Fixes doc of mouse area's onEntered Remove debug messages from mousearea autotest file Prevent handling of Up/Down on Mac OS X, for consistency with other platforms. Optimize QGW constructor. There is no Qt.widgets Avoid changing header dependencies. Avoid many unnecessary allocations, so so that paint engines attached to pixmaps Doc Fix autotests Fix autotests (remove import Qt.widgets) Add missing qml file to qdeclarativemousearea Doc fix Clean up example code, add white background behind text ...
| | | * | | fix webkit crash when accessing network on SymbianJanne Koskinen2010-05-111-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes crash on startup and crashes on network requests Task-number: QTBUG-9820 Reviewed-by: Janne Anttila
| | | * | Remove test cases which cause stack overflowShane Kearns2010-05-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These test cases are not considered reasonable for a small screen device (625 widgets). Patching the QWidget code to use iteration rather than recursion is considered too risky, as the code is performance critical. Task-number: QTBUG-8512 Reviewed-by: Bjoern Erik Nilsen
| | | * | Fix compile errorsShane Kearns2010-05-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added #ifdef QT_BUILD_INTERNAL for autotests which rely on AUTOTEST_EXPORT symbols (only available in internal developer configurations) Reviewed-by: Liang Qi
| | | * | Run autotests with minimal capabilitiesShane Kearns2010-05-1038-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotests were previously run with ALL-Tcb capability which gives them more access to the filesystem etc. than a typical Qt application. To have more realistic testing environmnent, tests are run with no capabilities other than those required for the Qt APIs they use. i.e. NetworkServices for network tests, None for others. Reviewed-by: Liang Qi
| | | * | Documentation updates for Qt/Symbian on Linux developmentThomas Zander2010-05-101-10/+8
| | | | |
| | | * | Allow EPOCROOT env var to be without trailing slash.Thomas Zander2010-05-101-8/+8
| | | | |
| | | * | Workaround for Symbian Open C bug in socket connect.Janne Anttila2010-05-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Socket connect in Symbian may return non-standard EPIPE error, after which the connection is terminated. Added Symbian specific workaround to set socket to UnconnectedState if EPIPE errno is received. In addition a bug report for Open C is created: http://developer.symbian.org/bugs/show_bug.cgi?id=2676 Task-number: QT-3362 Reviewed-by: Aleksandar Sasha Babic Reviewed-by: Markus Goetz
| | | * | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-1030-654/+933
| | | |\ \ | | |_|/ / | |/| | | | | | | | | | | | | Conflicts: src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h
| | | * | Fix fetchedRoot test variable to work also in SymbianMiikka Heikkinen2010-05-073-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RVCT builds cannot seem to be able to deal with data symbols at runtime, so made accessors for fetchedRoot test variable. Also moved it out of QFileInfoGatherer class as there is no need to have it there. Reviewed-by: Janne Koskinen
| | | * | Add configure time checks for symbian environmentThomas Zander2010-05-073-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding test for various compile time components like rcomp and the compiler actually working should make it failing much more transparant. Reviewed-by: Thiago
| | | * | Check for existance of sis file parameter to runonphoneShane Kearns2010-05-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, it would skip over a non existant sis file - which could cause invalid test results if a previous version of the sis was already installed. Now, it checks if the file exists and exits with an error message if asked to install a sis file that doesn't exist. Task-number: QTBUG-9290 Reviewed-by: Miikka Heikkinen
| | | * | Fix thread synchronization issues in Symbian QFileSystemWatcherMiikka Heikkinen2010-05-062-45/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian the QSymbianFileSystemWatcherEngine thread now stays running as long as the instance is alive to avoid repeatedly stopping and restarting the thread as watched paths are removed and added. Also fixed issue of misreporting adding failure in cases where both adds and removes were done in quick succession. Task-number: QTBUG-10091 Reviewed-by: Shane Kearns
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-0611-37/+62
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Disable compiling of the plugin when extra package not found Added missing UID3 for qsymbianbearer.dll. Enabled previously disabled Qt features. Fix includes so it compiles Use lowercase includes so it compiles in Linux too Fixed library dependency for Gnupoc. Removed the --export_all_vtbl from linking. Cleaned up the elf2e32 options a bit.
| | | | * | Disable compiling of the plugin when extra package not foundThomas Zander2010-05-042-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plugin will only compile when the symbian audiorouting API is installed which is not there by default. So check for that. The configure check should be added soon too.
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-049-33/+55
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added missing UID3 for qsymbianbearer.dll. Enabled previously disabled Qt features. Fix includes so it compiles Use lowercase includes so it compiles in Linux too Fixed library dependency for Gnupoc. Removed the --export_all_vtbl from linking. Cleaned up the elf2e32 options a bit.
| | | | | * | Added missing UID3 for qsymbianbearer.dll.Espen Riskedal2010-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without a proper UID3 it is not possible to sign Qt.sis at symbiansigned.com. I also reserved the UID3 in our Wiki pages Reviewed-by: Aleksandar Babic
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-038-33/+54
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enabled previously disabled Qt features. Fix includes so it compiles Use lowercase includes so it compiles in Linux too Fixed library dependency for Gnupoc. Removed the --export_all_vtbl from linking. Cleaned up the elf2e32 options a bit.
| | | | | | * | Enabled previously disabled Qt features.axis2010-05-031-2/+2
| | | | | | | |
| | | | | | * | Fix includes so it compilesThomas Zander2010-05-032-3/+2
| | | | | | | |
| | | | | | * | Use lowercase includes so it compiles in Linux tooThomas Zander2010-05-031-7/+7
| | | | | | | |
| | | | | | * | Fixed library dependency for Gnupoc.axis2010-05-031-1/+6
| | | | | | | |
| | | | | | * | Removed the --export_all_vtbl from linking.axis2010-05-032-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It causes wrong exports. This required rearranging some libraries to avoid undefined symbols.
| | | | | | * | Cleaned up the elf2e32 options a bit.axis2010-05-032-14/+31
| | | | | | | |
* | | | | | | | Dates and variants are not considered nested objectsAaron Kennedy2010-05-131-1/+2
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Correctly assign bool to variant propertiesAaron Kennedy2010-05-126-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-10623
* | | | | | | Improve Image docs. Move all fillMode image examples to fillModeBea Lam2010-05-1214-84/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | property docs and remove the animated gif.
* | | | | | | Flickable small API changes.Yann Bodson2010-05-1213-156/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Split moving into movingHorizontally anf movingVertically - Split flicking into flickingHorizontally and flickingVertically - Rename flickDirection to flickableDirection - onMovementStarted, onMovementEnded, onFlickStarted and onFlickEnded signals removed Task-number: QTBUG-10572 Reviewed-by: Martin Jones
* | | | | | | Reset the dragDropItem to 0 when the item dies while dragging on top it.Alexis Menard2010-05-122-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you drag something on top of an item and the former is deleted then we need to reset the dragDropItem pointer to 0. Task-number:KDE BUG 232182 Reviewed-by:leo
* | | | | | | Avoid warning (and possible future crash) upon reload.Warwick Allison2010-05-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10555
* | | | | | | Don't pass sequential (QNetworkReply) to image reader, it doesn't work well ↵Warwick Allison2010-05-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enough. Work around QTBUG-10622
* | | | | | | Stop GIF handler claiming it can report Size for sequential devices,Warwick Allison2010-05-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since it scans the entire image to do so (and then can't read the image). Task-number: QTBUG-10621
* | | | | | | Use raster graphicssystem for qml.app on OS X.Michael Brasser2010-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10544