summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-05-202-23/+73
|\
| * Fix crash on exit in native wifi plugin on Vista+ when run in debugger.Aaron McCarthy2010-05-202-23/+73
| | | | | | | | Close the wlanapi handle before main function returns.
* | Docs: added an intro for qml, Quick for Beginners.Peter Yard2010-05-206-0/+969
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-19112-3475/+3352
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Added default countries for Mongolian and Nepali. Updated tst_qlocale autotest. Updated the 4.7.0 change log with my changes. Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-19052010 ( 8039ba79702d6516cf6841c9f15b324ec499bbf3 ) doc: Fixed many broken links. doc: Fixed many broken links. doc: Fixed many broken links. qdoc: Set back to 3 cols for class list; we have a scrollbar now. Fix build on Mac OS X and Windows. Remove obsolete and broken qvfb skins. Only setup ICD test data when ICD is enabled. Doc: Fixed two diagrams and finally committed images for them. Make sure cursorPositionChanged is emitted when doing undo/redo Some more 4.7.0 changes Fix cosmetic issue in designer filter edits Doc: Adding support for IE 6, 7 and 8 doc: Updated the widgets tutorial to work without page links. My 4.7.0 changes Added support for es_419 locale. Added Korean and Nynorsk locales support on Symbian. ...
| * Added default countries for Mongolian and Nepali.Denis Dzyubenko2010-05-193-31/+43
| | | | | | | | | | Task-number: QTBUG-9370 Reviewed-by: trustme
| * Updated tst_qlocale autotest.Denis Dzyubenko2010-05-191-1/+88
| | | | | | | | | | | | | | Added countries/languages that were added in new cldr and forgotten to be added to the autotest. Reviewed-by: trustme
| * Updated the 4.7.0 change log with my changes.Kim Motoyoshi Kalland2010-05-191-0/+16
| |
| * Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-19517-57904/+15918
| |\ | | | | | | | | | | | | Conflicts: src/corelib/tools/qlocale_symbian.cpp
| * | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-05-194-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-19052010 ( 8039ba79702d6516cf6841c9f15b324ec499bbf3 ) Changes since last update: Mingw-w64 fixes
| * | doc: Fixed many broken links.Martin Smith2010-05-196-19/+30
| | |
| * | doc: Fixed many broken links.Martin Smith2010-05-1920-50/+50
| | |
| * | doc: Fixed many broken links.Martin Smith2010-05-1911-64/+49
| | |
| * | qdoc: Set back to 3 cols for class list; we have a scrollbar now.Martin Smith2010-05-191-1/+1
| | |
| * | Fix build on Mac OS X and Windows.Aaron McCarthy2010-05-194-13/+13
| | |
| * | Remove obsolete and broken qvfb skins.Jason McDonald2010-05-1925-437/+4
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-1947-2869/+3034
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Only setup ICD test data when ICD is enabled. Doc: Fixed two diagrams and finally committed images for them. Make sure cursorPositionChanged is emitted when doing undo/redo Some more 4.7.0 changes Fix cosmetic issue in designer filter edits Doc: Adding support for IE 6, 7 and 8 doc: Updated the widgets tutorial to work without page links. My 4.7.0 changes Added support for es_419 locale. Added Korean and Nynorsk locales support on Symbian. Gestures in GraphicsView do not require a viewport to subscribe to gestures. Upgraded QLocale to Unicode CLDR 1.8.1 Removed the "maybe" timer from gesturemanager. Fixes a crash and a memory leak in gesturemanager. Embedded changes for 4.7 Added a default value for optimization settings. Update Polish translations
| | * | Only setup ICD test data when ICD is enabled.Aaron McCarthy2010-05-193-12/+12
| | | | | | | | | | | | | | | | | | | | Fixes unit test build failures introduced in 90de3e5c903b67b2e5f3d7dc14266fe24f1daa23.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-05-1813-5/+71
| | |\ \
| | | * | Make sure cursorPositionChanged is emitted when doing undo/redoThorbjørn Lindeijer2010-05-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Done-by: mae Reviewed-by: Thorbjørn Lindeijer
| | | * | Some more 4.7.0 changesJens Bache-Wiig2010-05-181-2/+17
| | | | |
| | | * | Fix cosmetic issue in designer filter editsJens Bache-Wiig2010-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the icon position similar to Qt Creator and more consistent. Reviewed-by: trustme
| | | * | Doc: Adding support for IE 6, 7 and 8Morten Engvoldsen2010-05-1810-2/+45
| | | | | | | | | | | | | | | | | | | | Fixing index page bugs
| | * | | Doc: Fixed two diagrams and finally committed images for them.David Boddie2010-05-186-70/+68
| | |/ / | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-1825-2713/+2812
| | |\ \
| | | * | My 4.7.0 changesKent Hansen2010-05-181-0/+22
| | | | |
| | | * | Added support for es_419 locale.Denis Dzyubenko2010-05-187-358/+376
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new country code "419" which stands for "Latin America and the Caribbean". This is the first three-letter country code (from UN M.49). Task-number: QT-3312 Reviewed-by: Thiago Macieira
| | | * | Added Korean and Nynorsk locales support on Symbian.Denis Dzyubenko2010-05-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3368 Task-number: QT-3370 Reviewed-by: Thiago Macieira
| | | * | Gestures in GraphicsView do not require a viewport to subscribe to gestures.Denis Dzyubenko2010-05-186-25/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a graphicsitem subscribes to a gesture the viewport is implicitly subscribed to it as well. Task-number: QTBUG-9849 Reviewed-by: Olivier Goffart Reviewed-by: Mikko Harju
| | | * | Upgraded QLocale to Unicode CLDR 1.8.1Denis Dzyubenko2010-05-183-1668/+1668
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | Removed the "maybe" timer from gesturemanager.Denis Dzyubenko2010-05-182-38/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to users of the api "maybe" timer (that is supposed to cancel gestures that have stayed in the "MaybeGesture" state for too long) is not useful and might even harm some gestures, so removing it completely and leaving it up to the author of a gesture recognizer to make sure the state machine is implemented properly. Task-number: QTBUG-9926 Reviewed-by: Thomas Zander
| | | * | Fixes a crash and a memory leak in gesturemanager.Denis Dzyubenko2010-05-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | need to remove a QGesture object pointer from an internal hash when the widget/graphicsobject gets destroyed. Task-number: QTBUG-9801 Reviewed-by: Thomas Zander
| | | * | Embedded changes for 4.7Paul Olav Tvete2010-05-181-0/+2
| | | | |
| | | * | Added a default value for optimization settings.Martin Petersson2010-05-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10728 Reviewed-by: Thierry
| | | * | Update Polish translationsJarek Kobus2010-05-186-621/+618
| | | | |
| | * | | doc: Updated the widgets tutorial to work without page links.Martin Smith2010-05-183-71/+74
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-1949-259/+538
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (25 commits) Freetype is not used on symbian, don't use it. Disable compiling unsupported classes for Symbian Make the 'freeze' target work for linux/symbian. Update QtDeclarative .def files for 4.7 Improve virtual mouse on E72 optical joystick Fix build break in Symbian Set edit focus to proper control in flightinfo demo Update symbian def files for 4.7 Do not autopatch <app>_installer.pkg when self-signing Fix pkg_prerules handling for installer packages Fix weatherinfo and flightinfo to only request WLAN connection once Fix 'chapter5_plugins.dll.sym contains initialized writable data' Fix generation of stub sis files Fix SRCDIR and DEPLOYMENT usage in declarative benchmarks Shadow building on Symbian fixes: part 3 - unchanged source tree Shadow building on Symbian fixes: part 2 - populate bin dir correctly Shadow building on Symbian fixes: part 1 - files to right place Re-enable suppression of --export_all_vtbl for static libraries Omit building declarative/painting benchmark if no OpenGL configured Fix requires keyword handling in qmake in Symbian ...
| * | | | | Freetype is not used on symbian, don't use it.Thomas Zander2010-05-191-0/+1
| | | | | |
| * | | | | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-19517-57901/+15913
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_s60.cpp
| * | | | | Disable compiling unsupported classes for SymbianThomas Zander2010-05-191-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The accessibility classes are currently unsupported on Symbian, so don't compile them in. The various styles will not be pretty on symbian either, so don't compile them in.
| * | | | | Make the 'freeze' target work for linux/symbian.Thomas Zander2010-05-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users can type 'make freeze' to get the def files updated right in the git source tree
| * | | | | Update QtDeclarative .def files for 4.7Shane Kearns2010-05-192-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | Improve virtual mouse on E72 optical joystickShane Kearns2010-05-192-78/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses scancodes instead of keycodes, to get access to the 8-way cursor keys introduced in S60 3.2. (EStdKeyDevice10-13) Doubled the rate of acceleration and top speed of the cursor (this applies to all phones, but feedback was that the cursor was too slow) Multiple key presses within 500ms of each other are treated the same as key repeat events. This is because the E72 optical joystick sends pulsed key presses. Task-number: QTBUG-5711 Reviewed-by: Sami Merila
| * | | | | Fix build break in SymbianMiikka Heikkinen2010-05-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix this makefile syntax error when building Qt from root: "makefile:60: *** target pattern contains no `%'. Stop." Break was caused by having absolute path in $(MAKEFILE) variable, which broke subdir targets. Reviewed-by: Janne Koskinen
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-1945-187/+398
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Set edit focus to proper control in flightinfo demo Update symbian def files for 4.7 Do not autopatch <app>_installer.pkg when self-signing Fix pkg_prerules handling for installer packages Fix weatherinfo and flightinfo to only request WLAN connection once Fix 'chapter5_plugins.dll.sym contains initialized writable data' Fix generation of stub sis files Fix SRCDIR and DEPLOYMENT usage in declarative benchmarks Shadow building on Symbian fixes: part 3 - unchanged source tree Shadow building on Symbian fixes: part 2 - populate bin dir correctly Shadow building on Symbian fixes: part 1 - files to right place Re-enable suppression of --export_all_vtbl for static libraries Omit building declarative/painting benchmark if no OpenGL configured Fix requires keyword handling in qmake in Symbian Support device aliases in EPOCDEVICE Update Symbian DEF files for WINSCW and EABI Fix spurious mouse click when dismissing a native menu Add 'runonphone' target for symbian / makefile Double-click support for virtual cursor in Symbian
| | * | | | Set edit focus to proper control in flightinfo demoMiikka Heikkinen2010-05-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set edit focus to line edit control when user needs to input flight number. Task-number: QTBUG-10124 Reviewed-by: Shane Kearns
| | * | | | Update symbian def files for 4.7Shane Kearns2010-05-188-9/+89
| | | | | |
| | * | | | Do not autopatch <app>_installer.pkg when self-signingMiikka Heikkinen2010-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <app>_installer.pkg produces self-signable packages by default, so no need to patch it. Task-number: QTBUG-10746 Reviewed-by: Janne Koskinen
| | * | | | Fix pkg_prerules handling for installer packagesMiikka Heikkinen2010-05-181-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The removed check was causing dropping of vendor info from installer package files. No need to check for header in rawPkgPreRules as it would never get there in the first place; it gets placed into headerRules instead. Reviewed-by: Shane Kearns
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-1841-177/+309
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix weatherinfo and flightinfo to only request WLAN connection once Fix 'chapter5_plugins.dll.sym contains initialized writable data' Fix generation of stub sis files Fix SRCDIR and DEPLOYMENT usage in declarative benchmarks Shadow building on Symbian fixes: part 3 - unchanged source tree Shadow building on Symbian fixes: part 2 - populate bin dir correctly Shadow building on Symbian fixes: part 1 - files to right place Re-enable suppression of --export_all_vtbl for static libraries Omit building declarative/painting benchmark if no OpenGL configured Fix requires keyword handling in qmake in Symbian Support device aliases in EPOCDEVICE Update Symbian DEF files for WINSCW and EABI Fix spurious mouse click when dismissing a native menu Add 'runonphone' target for symbian / makefile Double-click support for virtual cursor in Symbian
| | | * | | | Fix weatherinfo and flightinfo to only request WLAN connection onceMiikka Heikkinen2010-05-182-50/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New bearer implementation will only keep connection alive as long as the QNetworkAccessManager instance is alive, so changed the demos to have single manager instance instead of recreating it for each request. Task-number: QTBUG-10151 Reviewed-by: Janne Anttila