summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-131-11/+7
|\
| * Removed broken tests from tst_QFileInfo::isSymlink_data()Zeno Albisser2010-04-131-11/+7
| | | | | | | | | | | | | | | | As long as we don't fully support NTFS junctions and volume ids, these tests would always fail. Further they rely on directories that are not available on Win7 anymore. Reviewed-by: Joao
* | qdoc: Fixed some TOC links.Martin Smith2010-04-131-1/+0
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-13587-4155/+10944
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-13211-962/+4439
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Revert Merge Request 551. This introduces regressions to Qt. Fixed scroll area size calculation on Mac. Fix a race where QThread::exit() is "lost" when called after start() make a partial build of linguist in no-gui config make the code less of a trap fix build from top level Partially revert MR 543 changes to Linguist. Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. ...
| | * Revert Merge Request 551. This introduces regressions to Qt.Thiago Macieira2010-04-122-59/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The regressions noticed were: Mac OS X: qmenu::menuGeometry line 1024 (new test) QWS and Win32: qmenubar::check_menuPosition line 1508 This reverts commits 6947390 and c1ce854.
| | * Fixed scroll area size calculation on Mac.Erik Verbruggen2010-04-121-4/+4
| | | | | | | | | | | | | | | | | | | | | This fixes the case where the scroll area was not tall enough, which happened when the fractional font metrics are returned. Reviewed-by: mae
| | * Fix a race where QThread::exit() is "lost" when called after start()Bradley T. Hughes2010-04-123-12/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QThread::exit() tries to stop all running event loops, but does nothing if the eventloop has not started yet. This is often the case for short- exit method on an object that has affinity to the thread. This ensures that the exit is called from the running eventloop, meaning the exit() will never be lost. Task-number: QTBUG-1184 Reviewed-by: Morten Sørvig
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-12208-950/+4424
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (58 commits) make a partial build of linguist in no-gui config make the code less of a trap fix build from top level Partially revert MR 543 changes to Linguist. Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. QtHelp: Fix auto tests. Fix a crash when unloading libQtCore Introduce a qconfig feature for QtDBus ...
| | | * make a partial build of linguist in no-gui configOswald Buddenhagen2010-04-122-2/+3
| | | |
| | | * make the code less of a trapOswald Buddenhagen2010-04-121-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it's not very wise to use += first, and then to overwrite everything with =. use proper scoping instead. Reviewed-by: joerg
| | | * fix build from top levelOswald Buddenhagen2010-04-121-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | even more fallout from MR 543. qt3support needs to be added after qtgui, as a build from top level is ordered, not dependency based. as i was at it, i cleaned up the platform conditionals some more. Reviewed-by: joerg
| | | * Partially revert MR 543 changes to Linguist.Thiago Macieira2010-04-122-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Whatever this is doing, it breaks the build on Windows CE/Mobile. This has stopped oslo-staging-1 from integrating for over a week now. Not reviewed. This patch is a blind attempt at fixing the issue.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-13546-3876/+10448
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits) doc fixes Don't test XmlListModel examples on platforms without QtXmlPatterns More error output for QML_IMPORT_TRACE=1 Fix declarative examples autotest, avoid using native separators Doc: update Rectangle smooth painting screenshot. Add some TextInput properties and methods Remove GraphicsObjectContainer from the documentation. import Qt 4.6 -> import Qt 4.7 Move documentation code to snippet. Test fix. Fix test Fix test on QWS. Fix PathView crash. Make bindings dump more useful Improve font value type documentation. coding conventions Doc fixes Warning Read Maemo orientation at startup Exclude gestures from examples autotest ...
| | * | | doc fixesYann Bodson2010-04-121-5/+15
| | | | |
| | * | | Don't test XmlListModel examples on platforms without QtXmlPatternsAlan Alpert2010-04-121-0/+6
| | | | |
| | * | | More error output for QML_IMPORT_TRACE=1mae2010-04-121-0/+9
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-12546-3871/+10418
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (144 commits) Fix declarative examples autotest, avoid using native separators Doc: update Rectangle smooth painting screenshot. Add some TextInput properties and methods Remove GraphicsObjectContainer from the documentation. import Qt 4.6 -> import Qt 4.7 Move documentation code to snippet. Test fix. Fix test Fix test on QWS. Fix PathView crash. Make bindings dump more useful Improve font value type documentation. coding conventions Doc fixes Warning Read Maemo orientation at startup Exclude gestures from examples autotest Exclude proxywidgets from examples autotest Fix crash on QScriptProgram destruction doc fixes ...
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-123-2/+3
| | | |\ \
| | | | * | Fix declarative examples autotest, avoid using native separatorsLeonardo Sobral Cunha2010-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Joona Petrell
| | | | * | Doc: update Rectangle smooth painting screenshot.Yann Bodson2010-04-122-0/+1
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-12606-4494/+7579
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetextinput.cpp src/declarative/graphicsitems/qdeclarativetextinput_p.h
| | | | * | Remove GraphicsObjectContainer from the documentation.Yann Bodson2010-04-121-1/+0
| | | | | |
| | | | * | import Qt 4.6 -> import Qt 4.7Yann Bodson2010-04-1222-22/+22
| | | | | |
| | | | * | Move documentation code to snippet.Yann Bodson2010-04-122-41/+39
| | | | | |
| | | | * | Test fix.Michael Brasser2010-04-121-2/+2
| | | | | |
| | | | * | Fix testBea Lam2010-04-121-1/+3
| | | | | |
| | | | * | Fix test on QWS.Michael Brasser2010-04-121-0/+4
| | | | | |
| | | | * | Fix PathView crash.Michael Brasser2010-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9753
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1236-677/+1790
| | | | |\ \
| | | | | * | Improve font value type documentation.Yann Bodson2010-04-123-5/+316
| | | | | | |
| | | | | * | coding conventionsYann Bodson2010-04-121-16/+14
| | | | | | |
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-1242-672/+1749
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/javascriptblocks.qdoc
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-12505-3538/+5185
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (130 commits) Warning Read Maemo orientation at startup Exclude gestures from examples autotest Exclude proxywidgets from examples autotest Fix crash on QScriptProgram destruction doc fixes Start documenting coding conventions Adds missing qml file to qdeclarativeflipable autotest Revert "Better reporting of extension plugin loading errors." Doc Fix graphicswidget auto-test. Add Mac OS X bundle description for qml runtime Cleanup Disallow writes to read-only value type properties Allow undefined to be assigned to QVariant properties Add a Qt.isQtObject() method Fix crash in QML library imports Remove QT_VERSION checks in QML List properties aren't read-only Small doc fix. ...
| | | | | * | | | Doc fixesBea Lam2010-04-124-20/+32
| | | | | | | | |
| | | | * | | | | Make bindings dump more usefulAaron Kennedy2010-04-121-46/+69
| | | | | |_|/ / | | | | |/| | |
| | | | * | | | WarningAaron Kennedy2010-04-121-1/+1
| | | | | | | |
| | | | * | | | Read Maemo orientation at startupAaron Kennedy2010-04-121-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT-2695
| | | | * | | | Exclude gestures from examples autotestAaron Kennedy2010-04-121-0/+1
| | | | | | | |
| | | | * | | | Exclude proxywidgets from examples autotestAaron Kennedy2010-04-121-0/+1
| | | | | | | |
| | | | * | | | Fix crash on QScriptProgram destructionAaron Kennedy2010-04-121-0/+4
| | | | | | | |
| | | | * | | | doc fixesYann Bodson2010-04-122-3/+3
| | | | | | | |
| | | | * | | | Start documenting coding conventionsYann Bodson2010-04-129-40/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2845
| | | | * | | | Adds missing qml file to qdeclarativeflipable autotestLeonardo Sobral Cunha2010-04-122-0/+14
| | | | |/ / /
| | | | * | | Revert "Better reporting of extension plugin loading errors."Aaron Kennedy2010-04-121-23/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e0dcdbd2984299665b9b784b201289219b9978d3.
| | | | * | | DocAaron Kennedy2010-04-121-2/+2
| | | | | | |
| | | | * | | Fix graphicswidget auto-test.Alexis Menard2010-04-122-52/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Michael Brasser
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-10490-3442/+4832
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (119 commits) Add Mac OS X bundle description for qml runtime Cleanup Disallow writes to read-only value type properties Allow undefined to be assigned to QVariant properties Add a Qt.isQtObject() method Fix crash in QML library imports Remove QT_VERSION checks in QML List properties aren't read-only Small doc fix. Make sure WorkerScript thread is stopped on deletion. This also fixes Release ListModel's worker agent on deletion. Doc fixes Fix example Example code style improvements Enable other wrapping modes. TextEdit::wrap changed to TextEdit::wrapMode enumeration Remove use of obsolete "Script" element. unwarn Replace "var" with "variant" in tests Fix test after deletion of GraphicsObjectContainer. ...
| | | | | * | | Add Mac OS X bundle description for qml runtimeKai Koehne2010-04-092-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, it's now Qml.app instead of qml.app. An icon is still missing. Reviewed-by: con
| | | | | * | | CleanupAaron Kennedy2010-04-092-88/+95
| | | | | | | |
generated by cgit v0.12 at 2025-03-01 21:37:55 (GMT)