summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-163-0/+4
|\ | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc
| * qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-163-0/+4
| | | | | | | | ...and a set of functional group pages.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-132-8/+12
|\ \ | |/ | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-121-3/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information.
| | * doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-111-3/+4
| | | | | | | | | | | | Either someone removed the QML: prefix, or it was never there.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-121-5/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Only modify pixmap cache reply when protected by a mutex Fix broken example code
| | * | Fix broken example codeBea Lam2010-08-121-5/+8
| | |/ | | | | | | | | | Task-number: QTBUG-12839
| * | Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-116-7/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-103-10/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits) Add text decoration support to QStaticText Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator QtDeclarative: get rid of warnings in public header doc: Clarify documentation of QStaticText Fix scrollbar randomly popping up in QPlainTextEdit Remove the definition of QT_HAVE_NEON from qt.prf Use the fast Neon conversion for converting colors of jpeg images. Do the conversion from RGB888 to RGB32 using Neon Move the build of Neon file from painting.pri to gui.pro QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads compilation with QT_NO_DEPRECATED Test we do not have compiler warnings in our headers with more options QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Doc: Fixed qdoc warnings. Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>" Doc: Fixed typo. Doc: Fixed QML documentation errors. Doc: Merged in some of Thomas Zander's suggestions. ...
* | \ \ Merge branch '4.7' of ../oslo-staging-2 into 4.7David Boddie2010-08-135-14/+14
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/getting-started/demos.qdoc doc/src/getting-started/gettingstartedqml.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-093-12/+15
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/getting-started/gettingstartedqml.qdoc
| | * | QtDeclarative: get rid of warnings in public headerOlivier Goffart2010-08-092-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | warning: use of old-style cast Reviewed-by: brad
| | * | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-091-6/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp src/network/bearer/qnetworkconfiguration.h
| * | | | Doc: Fixes to Qt Quick documentation.David Boddie2010-08-092-4/+4
| |/ / / | | | | | | | | | | | | | | | | Reviewed-by: Trust Me To-be-verified-by: Qt Doc Team
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-062-5/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qdeclarativeanimation.cpp
| * | | | Doc: Fixed qdoc warnings.David Boddie2010-08-051-4/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-106-8/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression add performance comparisons to qregexp benchmark configure: fix error message when calling config.status Fix invalid memory write during recursive timer activation Added comment about calendarPopup in setCalendarWidget function documentation. doc: Fixed some qdoc errors. Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938. CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE. XmlListModel doc fixes Mention QML_IMPORT_TRACE in Modules docs Merge sections about when property and default state Explain Flipable example further PathView required some diagonal movement before a drag was initiated. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0. doc: Fixed some qdoc errors. Add Ukrainian translation. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. ...
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-091-1/+1
| |\ \ \ \
| | * | | | doc: Fixed some qdoc errors.Martin Smith2010-08-091-1/+1
| | | |_|/ | | |/| |
| * | | | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-096-7/+7
| |/ / / | | | | | | | | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-11938
* | | | Associate qmlInfo() documentation with QDeclarativeEngineMartin Jones2010-08-101-0/+1
|/ / / | | | | | | | | | Task-number: QTBUG-12755
* | | Remove some warningsMartin Jones2010-08-051-6/+9
| |/ |/| | | | | Reviewed-by: Aaron Kennedy
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-051-4/+0
|\ \
| * | Re-enable script program caching on Symbian (used to be disabled due to ↵Joona Petrell2010-08-051-4/+0
| |/ | | | | | | | | | | | | crash problems that no longer occur). Task-number: QTBUG-12599 Reviewed-by: Martin Jones
* | Fix warning from whining complier.Martin Jones2010-08-051-1/+1
|/ | | | | Task-number: QTBUG-12473 Reviewed-by: Aaron Kennedy
* Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.Jerome Pasion2010-08-021-3/+2
|
* Fix compilation with QT_NO_TEXTCODECTasuku Suzuki2010-07-293-1/+6
| | | | | Merge-request: 755 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix compilation with QT_NO_XMLSTREAMREADERTasuku Suzuki2010-07-293-0/+10
| | | | | Merge-request: 757 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-293-41/+25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove warnings in photoviewer demo. Uncomment code accidentally removed with 1937adaab5861ced44813c6a4b0bff1c3750ecd3 Fix image source Don't emit movementEnded if mouse press is a continuation of a flick. Avoid binding loop warnings Append 'Example' to titles of example pages Improvements to Modules docs Component docs Fixes for Dynamic Object Management docs. Also adds links to Update Symbian emulator QtOpenVGu.def, QtNetworku.def, QtCoreu.def files for Qt 4.7 to be in sync between respective def files in Qt 4.6.3
| * Improvements to Modules docsBea Lam2010-07-291-3/+3
| | | | | | | | Task-number: QTBUG-12430
| * Component docsBea Lam2010-07-291-21/+9
| | | | | | | | Task-number: QTBUG-12447
| * Fixes for Dynamic Object Management docs. Also adds links toBea Lam2010-07-292-17/+13
| | | | | | | | | | | | this page from other documentation. Task-number: QTBUG-12446
* | QtDeclarative: Give name to function bindings and signals.Olivier Goffart2010-07-287-4/+14
|/ | | | | | | | Currently, bindings and signals are annonymous javascript functions. If one give them a name, a proper name is then shown in the javascript debugger. Reviewed-by: Aaron Kennedy
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-275-13/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QT_NO_DATESTRING Check the gesturemanager pointer before accessing it. Added files that had been renamed. Modified file/directory names and text to remove disallowed terminology. Cherry pick fix for MOBILITY-1077 from Qt Mobility. Fix typo in docs. Cherry pick fix for MOBILITY-1145 from Qt Mobility. Cherry pick fix for MOBILITY-1144 from Qt Mobility. Fixed the following sub-tasks for QTBUG-12192
| * Fix QT_NO_DATESTRINGTasuku Suzuki2010-07-275-13/+13
| | | | | | | | | | Merge-request: 730 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | various doc fixesBea Lam2010-07-273-5/+4
|/
* QDeclarativeEngineDebugServer: Fix crash when trying to update non-properties.Olivier Goffart2010-07-261-16/+14
| | | | | | | | | | | QDeclarativePropertyPrivate::setBinding would delete the binding if it cannot set the property. Then the call to binding->update() would crash. So test for (property.isProperty()) before. Also this will display a warning in the application output if the property cannot be changed. Reviewed-by: Lasse Holmstedt
* CompileAaron Kennedy2010-07-231-6/+3
|
* Generalize qml "registration"Aaron Kennedy2010-07-225-20/+62
| | | | | | While it is difficult to predict the future, the hope is that this might give us a little more flexibility when it comes to fixing bugs etc. in patch releases.
* Fix compiler warningAaron Kennedy2010-07-221-2/+0
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-222-3/+3
|\
| * Make rootContext and engine pointers in QDeclarativeView API constJoona Petrell2010-07-222-3/+3
| | | | | | | | | | Task-number: QTBUG-12322 Reviewed-by: Aaron Kennedy
* | Reuse QML lexer to simplify .pragma script logicAaron Kennedy2010-07-222-67/+42
|/
* Expand QDeclarativeExtensionPlugin docsBea Lam2010-07-211-12/+65
|
* Expand QtObject docBea Lam2010-07-211-7/+40
|
* font.letterSpacing used percentage rather than absolute values.Martin Jones2010-07-211-1/+1
| | | | | | | ... and percentage is useless. Task-number: QTBUG-12282 Reviewed-by: Warwick Allison
* various doc improvements for animation elementsBea Lam2010-07-201-4/+11
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-161-1/+1
|\ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix RightBearing confusion in text layout fixes, improvements for various docs and example code Fixed debugger's evaluation of dynamic properties in context Allow test to pass on smaller screens (eg. 480 high). Minor animation doc improvement
| * Fixed debugger's evaluation of dynamic properties in contextLasse Holmstedt2010-07-161-1/+1
| | | | | | | | Reviewed-by: Aaron Kennedy
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-161-7/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (104 commits) Fixed tst_maketestselftest::tests_pro_files failure remove nasty hack by using a stricter regexp (for language codes) cosmetics: quote the dot in the regexp remove dependency of ts targets on sub-tools add commit-ts target to commit ts files without line number info (re-)add 'untranslated' ts targets more fine-grained ts targets split qt_help out into an own ts target Unbreak the Maemo 5 build after the Symbian fix QNAM HTTP: Fix problem with cached files and metaDataChanged() Add a testcase for QTBUG-11213 to prevent future regressions. Autotest: reenable the NTLM proxy test on tst_QTcpSocket Autotest: add a small, boring test for QAuthenticator Add documentation for the QAuthenticator options. Expose the QAuthenticator map of options in the API. Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeader Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC" Fix for tst_qmdisubwindow::fixedMinMaxSize failure on Cocoa Add unit tests for QMimeData. fix qconfig.h reference for shadow builds ...
generated by cgit v0.12 at 2025-02-11 13:22:25 (GMT)