summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix for include "private/qt_s60_p.h" in non-symbian buildsmread2010-07-011-1/+1
| | | | Reviewed-by: Shane Kearns
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-0134-138/+540
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Making orbit input methods work with Qt apps with -no-s60 Using the remaining valid data to construct the QTime object when msec parsing failed. QProgressDialog text is too close to dialog border fix for broken input method loading Avkon Removal DEF file updates Stub version of QS60Style Avkon removal configured with -no-s60 QFileDialog broken in landscape in N8
| * Making orbit input methods work with Qt apps with -no-s60mread2010-07-011-2/+2
| | | | | | | | | | | | | | This change allows Qt to load the Orbit input methods in Symbian builds when Qt is configured with -no-s60 Reviewed-by: Sami Merila
| * Using the remaining valid data to construct the QTime object when msec ↵Liang Qi2010-07-011-1/+1
| | | | | | | | | | | | | | | | parsing failed. It's relevant with QTBUG-11623, but not a fix for it. Reviewed-by: Aleksandar Sasha Babic
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-07-0132-129/+521
| |\
| | * fix for broken input method loadingmread2010-07-011-1/+1
| | | | | | | | | | | | | | | Changed use of wrong flag "Q_WS_SYMBIAN" back to "Q_WS_S60" so that input methods should work correctly in S60 builds of Qt.
| | * Avkon Removal DEF file updatesmread2010-07-012-2/+46
| | | | | | | | | | | | | | | | | | This adds the s60framework exports to the Symbian DEF files. These new exports remove the need for apps using s60framework classes to link to Avkon.
| | * Stub version of QS60Stylemread2010-07-013-6/+137
| | | | | | | | | | | | | | | | | | | | | Added a stub version of QS60Style so that DEF files can be compatible between Qt configured with and without style-s60. Reviewed-by: Shane Kearns
| | * Avkon removal configured with -no-s60mread2010-07-0127-121/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avkon dependencies can be configured out with the -no-s60 configure flag, conversely Qt on Symbian will use Avkon if -s60 is configured. These changes are intended to keep or introduce binary compatibility between the s60 and no-s60 configurations. To do this, it has been necessary to introduce stub equivalents of the CAknAppUi related classes into the no-s60 configuration, and override all Avkon framework virtual functions in the QS60Main... classes. Other than that, these changes are mostly just correcting the use of the Q_WS_S60 flag so that it only refers to Avkon dependencies. Reviewed-by: Sami Merila
| * | QProgressDialog text is too close to dialog borderSami Merila2010-07-011-2/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to that in Symbian, dialog border is not definitive. The actual border might be few pixels inside the dialog area to support partial transparency of dialog corners. Therefore laying out labels to near border (to y coordinate 0) makes the label cross the dialog border area for some themes. Fixed, by moving the dialog content down PM_DefaultTopLevelMargin pixels. Task-number: QT-3511 Reviewed-by: Alessandro Portale
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-07-0115-688/+739
| |\
| * | QFileDialog broken in landscape in N8Sami Merila2010-06-301-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | The screen estate runs out for nHD landscape. Due to this, all "system" dialogs (file, color, font dialogs and wizards) in Symbian are now shown in fullscreen mode, instead of being just maximized. Task-number: QTBUG-11668 Reviewed-by: Miikka Heikkinen
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-01217-9059/+6970
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (76 commits) Reseted QtDeclarative module def files Get WebView tests passing again Remove arbitrary width checks Removed compilation warning for systems with no OpenGL support Fix bug in SameGame's dialog component doc fix Add abstractitemmodel example, and fix some model docs docs - quote code with snippets, other improvements Fix webkit import for webkit tests. Remove qmlviewer dependency on QDeclarativeTimer Remove a few more unnecessary exports. Don't export declarative private classes Add additional text layout benchmarks. Don't access uninitialized value. Minor Twitter demo enhancements Added SET_BINDING message to QDeclarative debugger protocol Add ListView.nextSection attached property Remove the old font.outline documentation Docs - add more links to relevant examples Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn't ...
| * | | Reseted QtDeclarative module def filesJoona Petrell2010-07-012-7793/+3307
| | | |
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-011-0/+2
| |\ \ \
| | * | | Removed compilation warning for systems with no OpenGL supportLasse Holmstedt2010-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| * | | | Get WebView tests passing againAlan Alpert2010-07-011-2/+0
| | | | | | | | | | | | | | | | | | | | zoomFactor was removed in the new version.
| * | | | Remove arbitrary width checksAlan Alpert2010-07-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Width is not an arbitrary value, it is the size of the rendered page (which is whatever webkit says it is). Width should be tested to be correct, but this change should be done by the maintainers (who should also take the autotest out of declarative). Task-number: QTBUG-11855
| * | | | Fix bug in SameGame's dialog componentAlan Alpert2010-07-012-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was emitting closed after already being closed. Task-number: QTBUG-11812
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-01393-2850/+5894
| |\ \ \ \ | | |/ / /
| | * | | doc fixBea Lam2010-07-011-2/+4
| | | | |
| | * | | Add abstractitemmodel example, and fix some model docsBea Lam2010-07-0112-127/+469
| | | | |
| | * | | docs - quote code with snippets, other improvementsBea Lam2010-07-019-109/+116
| | | | |
| | * | | Fix webkit import for webkit tests.Martin Jones2010-07-017-7/+7
| | | | |
| | * | | Remove qmlviewer dependency on QDeclarativeTimerMartin Jones2010-07-013-21/+23
| | | | |
| | * | | Remove a few more unnecessary exports.Martin Jones2010-07-014-6/+6
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-0112-687/+767
| | |\ \ \
| | | * | | Add additional text layout benchmarks.Michael Brasser2010-07-011-7/+51
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-01155-979/+2978
| | | |\ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (62 commits) Don't access uninitialized value. Added SET_BINDING message to QDeclarative debugger protocol Add ListView.nextSection attached property Remove the old font.outline documentation Docs - add more links to relevant examples Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn't Indicate default sizing option in qmlviewer Plug QdeclarativePixmapCache canceled request leak. update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. ...
| | * | | | Don't export declarative private classesMartin Jones2010-07-0135-52/+52
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Those required by creator are still exported. Everything else is no longer exported.
| | * | | Don't access uninitialized value.Martin Jones2010-06-301-10/+9
| | | | | | | | | | | | | | | | | | | | Viewport can move before any mouse press.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-30155-969/+2969
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (61 commits) Added SET_BINDING message to QDeclarative debugger protocol Add ListView.nextSection attached property Remove the old font.outline documentation Docs - add more links to relevant examples Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn't Indicate default sizing option in qmlviewer Plug QdeclarativePixmapCache canceled request leak. update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. ...
| | | * | | Added SET_BINDING message to QDeclarative debugger protocolLasse Holmstedt2010-06-305-7/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new message currently enables resetting bindings, literal values and signal handlers (onX: {...}) through the debugger. Reviewed-by: Roberto Raggi
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-301-2/+3
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-30148-934/+2800
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (58 commits) Docs - add more links to relevant examples Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn't Indicate default sizing option in qmlviewer Plug QdeclarativePixmapCache canceled request leak. update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling ...
| | | * | | | | Add ListView.nextSection attached propertyMartin Jones2010-06-305-10/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and also renamed ListView.prevSection to ListView.previousSection Task-number: QTBUG-11372
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-3028-181/+405
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Docs - add more links to relevant examplesBea Lam2010-06-3024-15/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11754
| | | | * | | | Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn'tBea Lam2010-06-303-165/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be used for deployment Task-number: QTBUG-11287
| | | | * | | | Indicate default sizing option in qmlviewerBea Lam2010-06-301-1/+1
| | | | | | | |
| | | * | | | | Remove the old font.outline documentationMartin Jones2010-06-303-18/+2
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text.style is the correct property, and this has never been available in TextInput or TextEdit. Task-number: QTBUG-11828
| | | * | | | Plug QdeclarativePixmapCache canceled request leak.Martin Jones2010-06-301-27/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11827
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-30124-726/+2366
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (54 commits) update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes ...
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-29124-726/+2366
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (54 commits) update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes ...
| | | | | * | | update qml.qch to version 4.7mae2010-06-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a version clash when both qt.qch and qml.qch are loaded into Qt Creator Done-with: Daniel Molkentin
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-29123-724/+2364
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (53 commits) Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes forgot to cleanup the code a bit after adding Maemo5 support ...
| | | | | | * | | Undefined is undefined, and now qml warns about itmae2010-06-291-3/+3
| | | | | | | | |
| | | | | | * | | Fix so window will resize with the root object (broken byBea Lam2010-06-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 156cabe79a64ffca8d6e1a2df99f35b413a48a39)
| | | | | | * | | Avoid duplicate code for testing initial sizesBea Lam2010-06-291-21/+15
| | | | | | | | |
| | | | | | * | | Remove an unnecessary connect() in TextInputMartin Jones2010-06-291-3/+1
| | | | | | | | |