summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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. ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-1228-631/+1423
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix build error in QtGui armv5 udeb Updated qtbench to build against modified QStaticText API Make compiling / linking a non-qt app work too on symbian/gcce When on Symbian use smaller files. Fixing the missing "\\" The cmd line arguments have not been delegated properly. Clear QFontCache TLS content before nullifying TLS pointer. Add --download option to runonphone Implement download support to TRK Launcher Fix library creation on symbian/gcce Update Symbian def files for 4.7 Various fixes for symbian/gcce building. Make encoding clear Fix 'make sis' working on symbian makefile based system again. Make shipped symbian scripts available from the build-dir bin dir.
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-1028-631/+1423
| | | |\ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix build error in QtGui armv5 udeb Updated qtbench to build against modified QStaticText API Make compiling / linking a non-qt app work too on symbian/gcce When on Symbian use smaller files. Fixing the missing "\\" The cmd line arguments have not been delegated properly. Clear QFontCache TLS content before nullifying TLS pointer. Add --download option to runonphone Implement download support to TRK Launcher Fix library creation on symbian/gcce Update Symbian def files for 4.7 Various fixes for symbian/gcce building. Make encoding clear Fix 'make sis' working on symbian makefile based system again. Make shipped symbian scripts available from the build-dir bin dir.
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-1028-631/+1423
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix build error in QtGui armv5 udeb Updated qtbench to build against modified QStaticText API Make compiling / linking a non-qt app work too on symbian/gcce When on Symbian use smaller files. Fixing the missing "\\" The cmd line arguments have not been delegated properly. Clear QFontCache TLS content before nullifying TLS pointer. Add --download option to runonphone Implement download support to TRK Launcher Fix library creation on symbian/gcce Update Symbian def files for 4.7 Various fixes for symbian/gcce building. Make encoding clear Fix 'make sis' working on symbian makefile based system again. Make shipped symbian scripts available from the build-dir bin dir.
| | | | * | Fix build error in QtGui armv5 udebShane Kearns2010-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typo in the .pro file was causing the linker flags to never be set. Reviewed-by: Trust Me
| | | | * | Updated qtbench to build against modified QStaticText APIGareth Stockwell2010-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3cebc028 replaced QStaticText::setMaximumSize with QStaticText::setTextWidth. Reviewed-by: Eskil Abrahamsen Blomfeldt
| | | | * | Make compiling / linking a non-qt app work too on symbian/gcceThomas Zander2010-04-082-11/+14
| | | | | |
| | | | * | When on Symbian use smaller files.Aleksandar Sasha Babic2010-04-081-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-9417 Reviewed-by: TrustMe
| | | | * | Fixing the missing "\\"Aleksandar Sasha Babic2010-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | * | The cmd line arguments have not been delegated properly.Aleksandar Sasha Babic2010-04-081-32/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-9377 Reviewed-by: Joao
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-04-08771-7758/+18989
| | | | |\ \
| | | | | * | Add --download option to runonphoneShane Kearns2010-04-071-36/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | runonphone --download <remote file> <local file> Can be used to copy files from the phone to the PC. Typical use would be to get a test log, for example: runonphone -s tst_qdir.sis -d c:\data\log.txt c:\temp\log.txt tst_qdir.exe -o c:\temp\log.txt Reviewed-by: Thomas Zander
| | | | | * | Implement download support to TRK LauncherShane Kearns2010-04-073-24/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the TRK protocol to copy a file from the phone to PC after running the executable. This can be used for example to download a log file containing test results. Submitted upstream as commit 9b65c244d7027d78f0b40450961eab68680d6269. Reviewed-by: Friedemann Kleint
| | | | | * | Fix library creation on symbian/gcceThomas Zander2010-04-071-0/+1
| | | | | | |
| | | | | * | Update Symbian def files for 4.7Shane Kearns2010-04-0713-510/+1109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | * | Various fixes for symbian/gcce building.Thomas Zander2010-04-073-17/+33
| | | | | | |
| | | | | * | Make encoding clearThomas Zander2010-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-072-3/+20
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix 'make sis' working on symbian makefile based system again. Make shipped symbian scripts available from the build-dir bin dir.
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-062-3/+20
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix 'make sis' working on symbian makefile based system again. Make shipped symbian scripts available from the build-dir bin dir.
| | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-062-3/+20
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix 'make sis' working on symbian makefile based system again. Make shipped symbian scripts available from the build-dir bin dir.
| | | | | | | | * | Fix 'make sis' working on symbian makefile based system again.Thomas Zander2010-04-061-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only use EPOCROOT as the source for libs on symbian-abld|symbian-sbsv2
| | | | | | | | * | Make shipped symbian scripts available from the build-dir bin dir.Thomas Zander2010-04-061-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | | | * | | | | | Clear QFontCache TLS content before nullifying TLS pointer.Janne Koskinen2010-04-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If not cleared server handles are left open causing Font Server to Panic with KErrInUse in Symbian. Task-number: QTBUG-9565 Reviewed-by: Simon Hausmann
| * | | | | | | | | 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. ...