summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix gcce building of apps using static libraries in symbian-sbsv2Miikka Heikkinen2010-08-317-13/+50
| | | | | | | | | Removed usage of buggy .release_gcce target from symbian-sbsv2 generated makefiles. Now gcce builds like armv5 as it is supposed to when using Raptor. Task-number: QTBUG-13307 Reviewed-by: axis
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-3161-1224/+2135
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't double call classBegin() Notify QML internal notifiers of item geometry changes before QML signal handlers. Revert "Add 'cached' property to Image." Add 'cached' property to Image. Ensure Flickable visibleArea is updated when view height changes Improve calling QML functions from C++ docs. Add missing license headers Remove debug. Snake: Don't use Behavior with states. QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu Fix application exiting in embedded qml examples QDeclarativeDebug: Destroy incoming connections if already connected Simplify type management code QML JavaScript .import parser Fix VisualDataModel model update handling when rootIndex is specified. Improve test reliability when running in parallel with other tests. Improve stability of test on loaded hw. Improve stability of test on loaded hw.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-311-6/+6
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-310-0/+0
| | |\
| | * | Notify QML internal notifiers of item geometry changes before QML signal ↵Martin Jones2010-08-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | handlers. Task-number: QTBUG-12303 Reviewed-by: Aaron Kennedy
| * | | Don't double call classBegin()Aaron Kennedy2010-08-316-2/+42
| | | | | | | | | | | | | | | | QTBUG-13114
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-3162-152/+782
| |\ \ \ | | | |/ | | |/|
| | * | Revert "Add 'cached' property to Image."Yann Bodson2010-08-319-96/+28
| | | | | | | | | | | | | | | | | | | | | | | | This will have to go in 4.8. This reverts commit 3928cb20ecc63ed21cdb122388b200c9ab8e7cad.
| | * | Add 'cached' property to Image.Yann Bodson2010-08-319-28/+96
| | |/ | | | | | | | | | | | | Task-number: QTBUG-7300 Reviewed-by: Aaron Kennedy
| | * Ensure Flickable visibleArea is updated when view height changesMartin Jones2010-08-315-0/+64
| | | | | | | | | | | | Task-number: QTBUG-13095
| | * Improve calling QML functions from C++ docs.Martin Jones2010-08-311-0/+14
| | |
| | * Add missing license headersJoona Petrell2010-08-313-0/+120
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-3030-26/+193
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove debug. Snake: Don't use Behavior with states. QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu Fix application exiting in embedded qml examples QDeclarativeDebug: Destroy incoming connections if already connected Fix VisualDataModel model update handling when rootIndex is specified. Improve test reliability when running in parallel with other tests. Improve stability of test on loaded hw. Improve stability of test on loaded hw.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-3030-26/+193
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove debug. Snake: Don't use Behavior with states. QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu Fix application exiting in embedded qml examples QDeclarativeDebug: Destroy incoming connections if already connected Fix VisualDataModel model update handling when rootIndex is specified. Improve test reliability when running in parallel with other tests. Improve stability of test on loaded hw. Improve stability of test on loaded hw.
| | | | * Remove debug.Martin Jones2010-08-301-1/+0
| | | | |
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-3019-8/+83
| | | | |\
| | | | | * QML Viewer should be put under QtDemos instead of QtExamples folder in ↵Joona Petrell2010-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian app menu Task-number: Reviewed-by: Martin Jones
| | | | | * Fix application exiting in embedded qml examplesJoona Petrell2010-08-3018-7/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13178 Reviewed-by: Martin Jones
| | | | * | Snake: Don't use Behavior with states.Martin Jones2010-08-304-5/+18
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing states mid-animation confuses states where property value is not specified explicitly for each state. Task-number: QT-3823
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-3034-426/+17
| | | | |\
| | | | | * QDeclarativeDebug: Destroy incoming connections if already connectedLasse Holmstedt2010-08-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, QML Inspector in Qt Creator gets no error message for failed connections, which can lead to confusion. Reviewed-by: ogoffart
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2775-324/+4527
| | | | |\ \
| | | | * | | Fix VisualDataModel model update handling when rootIndex is specified.Martin Jones2010-08-273-12/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13038
| | | | * | | Improve test reliability when running in parallel with other tests.Martin Jones2010-08-271-0/+9
| | | | | | |
| | | | * | | Improve stability of test on loaded hw.Martin Jones2010-08-271-0/+1
| | | | | | |
| | | | * | | Improve stability of test on loaded hw.Martin Jones2010-08-271-1/+1
| | | | | | |
| * | | | | | Simplify type management codeAaron Kennedy2010-08-2720-1190/+1474
| | | | | | |
| * | | | | | QML JavaScript .import parserAaron Kennedy2010-08-272-0/+222
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-3142-497/+5680
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix #pragma message(), the message must be enclosed in parentheses preserve non-standard source references QSslConfiguration: fix crash when accessing null pointer properly parse ts contexts in obsolete messages move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handler Fix static build on Windows with MinGW. Reenable the reporting of CPU features. make qdoc3 boot-strappable again fix MinGW cross compilation with -debug-and-release Updated and new Slovenian translations for Qt 4.7 Designer: Fix crash on unsupported Language/Country combination. Doc: Fixed qdoc warnings and generalized the date and time descriptions. Doc: Whitespace fixes. Doc: Fixed snippets in QML introduction broken in an earlier commit. doc: Fixed numerous qdoc warnings.
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-3042-497/+5680
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix #pragma message(), the message must be enclosed in parentheses preserve non-standard source references QSslConfiguration: fix crash when accessing null pointer properly parse ts contexts in obsolete messages move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handler Fix static build on Windows with MinGW. Reenable the reporting of CPU features. make qdoc3 boot-strappable again fix MinGW cross compilation with -debug-and-release Updated and new Slovenian translations for Qt 4.7 Designer: Fix crash on unsupported Language/Country combination. Doc: Fixed qdoc warnings and generalized the date and time descriptions. Doc: Whitespace fixes. Doc: Fixed snippets in QML introduction broken in an earlier commit. doc: Fixed numerous qdoc warnings.
| * | | | | Fix #pragma message(), the message must be enclosed in parenthesesminiak2010-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 796 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | preserve non-standard source referencesOswald Buddenhagen2010-08-303-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the PO format doc suggests that all references are in filename:linennumber format, but some tools seem to deviate from that. so do our best to preserve such references, even if we can't do anything with them. Task-number: QTBUG-9488
| * | | | | QSslConfiguration: fix crash when accessing null pointerPeter Hartmann2010-08-302-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were accessing the d-pointer of a QSslConfiguration which is initialized lazily. Reviewed-by: Markus Goetz Task-number: QTBUG-13265
| * | | | | properly parse ts contexts in obsolete messagesOswald Buddenhagen2010-08-302-0/+11
| | | | | |
| * | | | | move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handlerOswald Buddenhagen2010-08-302-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after all, it is pretty much specific to xlf files, even if the problem majorly concerns converted po files.
| * | | | | Fix static build on Windows with MinGW.Mark Brand2010-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for static code. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | | | Reenable the reporting of CPU features.Thiago Macieira2010-08-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | The linking error before was most likely namespace issue
| * | | | | make qdoc3 boot-strappable againHarald Fernengel2010-08-301-0/+1
| | | | | |
| * | | | | fix MinGW cross compilation with -debug-and-releaseMark Brand2010-08-301-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed two issues in the configure script that prevented -debug-and-release from working correctly: We now allow dual debug and release mode for MinGW. We follow configure.exe in *not* settting PRECOMPILED_DIR. This gives qmake the freedom to put the debug and release precompiled headers in separate directories. Merge-request: 794 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | Updated and new Slovenian translations for Qt 4.7Oswald Buddenhagen2010-08-307-352/+4403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 793 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | Designer: Fix crash on unsupported Language/Country combination.Friedemann Kleint2010-08-301-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...in the property editor (QLocale). Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Task-number: QTBUG-13267 Task-number: QTCREATORBUG-2212
| * | | | | Doc: Fixed qdoc warnings and generalized the date and time descriptions.David Boddie2010-08-271-16/+2
| | | | | |
| * | | | | Doc: Whitespace fixes.David Boddie2010-08-272-26/+26
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-2799-698/+481
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-272-52/+19
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed numerous qdoc warnings.
| | | * | | | | doc: Fixed numerous qdoc warnings.Martin Smith2010-08-272-52/+19
| | | | | | | |
| * | | | | | | Doc: Fixed snippets in QML introduction broken in an earlier commit.David Boddie2010-08-2718-34/+1119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported on the qt-qml mailing list.
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-302-19/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Text is inputted on top of existing text in anomaly QLineEdit cursor is shown when asked to be non-visible
| * | | | | | | Text is inputted on top of existing text in anomalySami Merila2010-08-301-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch Anomaly demo app to use QLineEdit::setPlaceHolderText instead of using own internal paint event handling for Address bar widget. Task-number: QT-3657 Reviewed-by: Miikka Heikkinen
| * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-08-27164-847/+4845
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
generated by cgit v0.12 at 2024-12-28 17:39:37 (GMT)