summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QDeclarativeView: Add a Designer plugin.Friedemann Kleint2010-03-024-0/+220
| | | | | Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Acked-by: akennedy <qt-info@nokia.com>
* QDeclarativeView: Make usable in DesignerFriedemann Kleint2010-03-021-1/+3
| | | | | | Make source a designable property, add missing declarations for enumerations. Reviewed-by: akennedy <qt-info@nokia.com>
* minor optimization: don't mark contents as dirty if nothing was changedRitt Konstantin2010-03-021-3/+9
| | | | | Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
* minor optimization: ignore invalid preeditAreaPosition/preeditAreaTextRitt Konstantin2010-03-021-17/+23
| | | | | Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
* remove unused codeRitt Konstantin2010-03-021-1/+0
| | | | | Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
* minor clean-ups and styling fixesRitt Konstantin2010-03-021-16/+12
| | | | | Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
* don't even try to rehighlight invalid or alien blockRitt Konstantin2010-03-021-1/+1
| | | | | Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
* don't cancel the scheduled complete rehighlight from rehighlightBlock()Ritt Konstantin2010-03-021-0/+5
| | | | | | | | | if rehighlightBlock() is called just after setDocument() then it is possible that reformatBlocks() will be called just before q_delayedRehighlight() and thus will prevent previously scheduled complete rehighlighting. Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
* replace temporary disconnection with a very simple statemachineRitt Konstantin2010-03-021-6/+14
| | | | | | | | this also fixes an issue with non-constant ordering of connections to document's contentsChange() signal Merge-request: 481 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
* Merge branch 'master-staging1' into 4.7-staging1Denis Dzyubenko2010-03-022-8/+105
|\
| * Extended gesture autotest.Denis Dzyubenko2010-03-012-1/+59
| | | | | | | | | | | | | | | | Make sure partial gestures do not propagate further if an item that expects partial gestures received it. Task-number: resulted from QTBUG-6876 Reviewed-by: trustme
| * Fixed coordinate system conversion for gestures.Denis Dzyubenko2010-03-012-7/+46
| | | | | | | | | | | | | | | | | | When converting hotspot position (which is in global coordinates) to graphics scene coordinates we should use the viewport because the mapToScene() takes a position in a viewport. Task-number: related to QTBUG-6876 Reviewed-by: Thomas Zander
* | doc: Fixed some qdoc errors.Martin Smith2010-03-022-2/+2
| |
* | qdoc: Second attempt, QML doc stuff.Martin Smith2010-03-027-36/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | This change caused a crash on several platforms before, but not on mine, of course. It outputs a list of new QML elements on the What's New in 4.7 page, and it outputs the "Inherited by" list on each QML elemnent page for elements that are inherited by other elements. I can't see why it should crash anything, but I have included some debug output. I think the crash might have something to do with QList<T>, which qdoc3 uses heavily. If it crashes for you, please get a stack trace and the debug output.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0222-302/+730
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bearer management changes from Qt Mobility (fca9891).
| * \ Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-03-022627-143654/+170820
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/plugins/bearer/corewlan/qcorewlanengine.mm
| * | | Bearer management changes from Qt Mobility (fca9891).Aaron McCarthy2010-03-0223-369/+794
| | | | | | | | | | | | | | | | fca98911b75ce12e70d93cfc2932a9759758a605
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-015-32/+60
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: removed dead code QMetaObject::invokeMethod: print a warning if the method is not found. Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-015-32/+60
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: removed dead code QMetaObject::invokeMethod: print a warning if the method is not found. Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.
| | * | | removed dead codeThierry Bastian2010-03-011-21/+12
| | | | | | | | | | | | | | | | | | | | Reviewed-by: denis
| | * | | QMetaObject::invokeMethod: print a warning if the method is not found.Olivier Goffart2010-03-013-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adapt QTestLib not to call invokeMethod on unexisting method to avoid warnings Task-number: QTBUG-7331 Reviewed-by: Brad
| | * | | Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.Trond Kjernåsen2010-03-011-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the 4.7 port of d04f5336f769d9e5d2f9105e1da4a7d23ea91795. Task-number: related to QTBUG-8455 Reviewed-by: Kim
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0121-61/+152
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: typo for windows ce exclusion rule Updated .gitignore with the new name of the qmlviewer Fixed the close button of the find widget in Assistant Doc: brief Qt Quick introduction on "What's New" page. Interview Demo: Fix warning about pixmap leak on X11. Perform latin1 conversion directly on JSC::UString Avoid conversion between JavaScriptCore String type and QString Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7. Use QList::reserve() in QDataStream>>QList Added static method isValidColor to QColor. compile fix with namespaces build fix for WinCE qDetectCPUFeatures: compile fix with namespaces compile fix for WinCE Mac: using Qt to write plugins disables quit for 3rd party application doc: Fixed building documentation Updated syncqt to use relative include paths on cygwin as well.
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-012-1/+2
| |\ \ \ \
| | * | | | Updated .gitignore with the new name of the qmlviewerThorbjørn Lindeijer2010-03-011-1/+1
| | | | | |
| | * | | | Fixed the close button of the find widget in AssistantThorbjørn Lindeijer2010-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Done with Christian Kandeler.
| * | | | | typo for windows ce exclusion ruleMaurice Kalinowski2010-03-011-1/+1
| |/ / / / | | | | | | | | | | | | | | | Reviewed-by: Paul Olav Tvete
| * | | | Doc: brief Qt Quick introduction on "What's New" page.Volker Hilsheimer2010-03-011-1/+24
| | | | |
| * | | | Interview Demo: Fix warning about pixmap leak on X11.Friedemann Kleint2010-03-012-1/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
| * | | | Perform latin1 conversion directly on JSC::UStringKent Hansen2010-03-013-28/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This conversion needs to be as fast as possible since it's performed every time you access a QObject property from QtScript. Hence, we should avoid going via QString and instead do the conversion ourselves. Reviewed-by: Jedrzej Nowacki
| * | | | Avoid conversion between JavaScriptCore String type and QStringKent Hansen2010-03-014-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use JSC::UString internally. Only when the public API demands it should a JSC::UString be converted to a QString. Reviewed-by: Jedrzej Nowacki
| * | | | Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7.Volker Hilsheimer2010-03-011-3/+5
| | | | |
| * | | | Use QList::reserve() in QDataStream>>QListAndreas Kling2010-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| * | | | Added static method isValidColor to QColor.Erik Verbruggen2010-03-012-3/+28
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Gunnar Sletta
| * | | | compile fix with namespaceshjk2010-03-011-1/+2
| | | | |
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-011-2/+1
| |\ \ \ \
| | * | | | qDetectCPUFeatures: compile fix with namespaceshjk2010-03-011-2/+1
| | | | | |
| * | | | | build fix for WinCEMaurice Kalinowski2010-03-011-1/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | only use xmlpatterns if Qt is configured to build it Reviewed-by: Paul Olav Tvete
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47Maurice Kalinowski2010-03-013-4/+19
| |\ \ \ \
| | * | | | Mac: using Qt to write plugins disables quit for 3rd party applicationRichard Moe Gustavsen2010-03-011-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that qt_init always installs/overwrites apple event handlers. So if the 3rd party app had already installed an event handler for kAEQuit, then it will be removed when the Qt plugin is loaded. This patch checks (in the carbon case) if event handlers already exists before installing new ones, or, in the cocoa case, avoids installing apple event handlers if the AA_MacPluginApplication is set. In other words, handling quit etc is seen as the responsibility of the app, and not the plugin. Task-number: QTBUG-8087 Reviewed-by: prasanth
| | * | | | doc: Fixed building documentationThorbjørn Lindeijer2010-03-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | qml.qdocconf wasn't renamed yet.
| | * | | | Updated syncqt to use relative include paths on cygwin as well.Zeno Albisser2010-03-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | compile fix for WinCEMaurice Kalinowski2010-03-011-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | do not include headers of disabled modules Reviewed-by: Paul Olav Tvete
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0129-35/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make SameGame tutorials share images Fix minehunt demo Make Minehunt demo compile.
| * | | | | Make SameGame tutorials share imagesAlan Alpert2010-03-0127-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's a bit of a waste to have four copies of all of the images. And as an advanced tutorial throwing in a minor complication like this is probably beneficial. Additionally, the background has been replaced by a smaller JPEG version.
| * | | | | Fix minehunt demoAlan Alpert2010-03-012-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Game works again, and the issue with X11 native rendering being abysmally slow has been 'fixed'.
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-03-01553-5841/+29579
| |\ \ \ \ \
| * | | | | | Make Minehunt demo compile.Alan Alpert2010-03-011-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It still isn't working though. Investigations continue. Task-number: QTBUG-8549
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-012-3/+4
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix building with Sun CC 5.10: missing :: for the QWeakPointer declaration compile fix for WinCE
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-012-3/+4
| |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix building with Sun CC 5.10: missing :: for the QWeakPointer declaration compile fix for WinCE
generated by cgit v0.12 at 2025-08-16 11:39:41 (GMT)