summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-101-1/+1
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: adjust phony target hack to gdb_dwarf_index addition
| * adjust phony target hack to gdb_dwarf_index additionOswald Buddenhagen2010-09-101-1/+1
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-09-093-21/+50
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: State handling cleanup
| * State handling cleanupmae2010-09-093-21/+50
| | | | | | | | | | | | The game could end up in funky states when restarting while the startup animation was running. Also some smaller fixes for rotation.
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-093-9/+98
|\ \ | |/ |/| | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc update regarding threaded painting with QPainter in the QGL module.
| * Doc update regarding threaded painting with QPainter in the QGL module.Trond Kjernåsen2010-09-093-9/+98
|/ | | | Reviewed-by: Gunnar
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-081-0/+17
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add average frame timing to QDeclarativeView, ifdef'ed out.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-081-0/+17
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add average frame timing to QDeclarativeView, ifdef'ed out.
| | * Add average frame timing to QDeclarativeView, ifdef'ed out.Gunnar Sletta2010-09-081-0/+17
| | | | | | | | | | | | Reviewed-by: Aaron Kennedy
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-081-16/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove static vs dynamic library autodetection from qmake in Symbian
| * | Remove static vs dynamic library autodetection from qmake in SymbianMiikka Heikkinen2010-09-081-16/+4
| |/ | | | | | | | | | | | | | | Autodetection was unreliable and there was no practical way to make it reliable even for common cases, so it was removed. Task-number: QTBUG-13498 Reviewed-by: Janne Koskinen
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-0819-105/+669
|\ \ | |/ |/| | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Designer/uic: Start on support for QIcon::fromTheme().
| * Designer/uic: Start on support for QIcon::fromTheme().Friedemann Kleint2010-09-0819-105/+669
|/ | | | | | | | | | | | | | | | Schemas: Add "theme" attribute to <iconset> element of the UI format. uic: Extend it to generate the code for icons with themes and/or resource paths, add auto-test for it. Designer: Add 'theme'-member to PropertySheetIconValue + convenience functions including subproperty mask handling and simplify the existing code. Add new class IconThemeEditor to be used in action editor dialog and property editor. Theme names can now be specified in the action editor dialog. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-7777
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-072-53/+58
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Once we set a new source model, we need to disconnect the old one. Add a boommark toolbar menu item as well.
| * Once we set a new source model, we need to disconnect the old one.kh12010-09-071-52/+51
| |
| * Add a boommark toolbar menu item as well.kh12010-09-071-1/+7
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-072-5/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Do not > /dev/null gdb output. Remove unused local variable in myanmar shaper of harfbuzz
| * | Do not > /dev/null gdb output.Arvid Ephraim Picciani2010-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Trust that gdb --quiet works. Gdb 7.1 asks the user for confirmation on stdin, regardless of --batch, when it loads a corrupt binary. As a result, the build process halts. At least provide evidence why it does that, by not redirecting output. Reviewed-by: hjk
| * | Remove unused local variable in myanmar shaper of harfbuzzJiang Jiang2010-09-071-4/+0
| | | | | | | | | | | | Reviewed-by: Lars Knoll
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-071-0/+12
|\ \ \ | |/ / |/| / | |/ | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QDataStream doesn't check return values from QIODevice::write
| * QDataStream doesn't check return values from QIODevice::writeCarlos Manuel Duclos Vergara2010-09-071-0/+12
| | | | | | | | | | | | | | | | | | | | | | QDataStream does not check values from QIODevice::write and QIODevice::read since it cannot decide what to do in case of errors or less data written or read. The fix for this is to fix the documentation for QIODevice::writeData and QIODevice::readData to make sure implementations write and read all the requested data. Task-number: QTBUG-13108 Reviewed-by: David Boddie
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-065-36/+117
|\ \ | |/ | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Implement bookmarks toolbar.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-065-36/+117
| |\ |/ / | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Implement bookmarks toolbar.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-065-36/+117
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Implement bookmarks toolbar.
| | * Implement bookmarks toolbar.kh12010-09-065-36/+117
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-062-9/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Group cd, so the entire command fails if cd fails Remove temporary gdb-index after merging it Enable QLibrary debugging via QT_DEBUG_PLUGINS
| * | Group cd, so the entire command fails if cd failsArvid Ephraim Picciani2010-09-061-1/+1
| | | | | | | | | | | | Reviewed-by: ossi
| * | Remove temporary gdb-index after merging itArvid Ephraim Picciani2010-09-061-1/+2
| | | | | | | | | | | | Reviewed-by: ossi
| * | Enable QLibrary debugging via QT_DEBUG_PLUGINSArvid Ephraim Picciani2010-09-061-7/+5
| | | | | | | | | | | | Reviewed-by: janarve
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-061-2/+5
|\ \ \ | |/ / | | / | |/ |/| | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Allow QGLWidgets to draw them selves under -graphicssystem raster again...
| * Allow QGLWidgets to draw them selves under -graphicssystem raster again...Gunnar Sletta2010-09-061-2/+5
| | | | | | | | Reviewed-by: Fabien Freling
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-0333-5/+217
|\ \ | |/ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: C++0x: being able to create a list with the {,,,} notation C++0x move operators Add define for c++0x initilizer lists Add some constants for C++0x features
| * C++0x: being able to create a list with the {,,,} notationOlivier Goffart2010-09-034-1/+61
| | | | | | | | Reviewed-by: Joao
| * C++0x move operatorsOlivier Goffart2010-09-0330-5/+137
| | | | | | | | | | | | | | This makes assignement faster from temporaries, as the operator is fully inline, and doesn't do any atomic operations. Reviewed-by: joao
| * Add define for c++0x initilizer listsOlivier Goffart2010-09-031-0/+1
| | | | | | | | Reviewed-by: Joao
| * Add some constants for C++0x featuresThiago Macieira2010-09-031-0/+19
|/ | | | | Reviewed-by: Olivier Goffart Reviewed-by: Joao
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-032-0/+37
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added a QDebug operator for QSymbianEvent.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-022-0/+37
| |\ |/ / | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added a QDebug operator for QSymbianEvent.
| * Added a QDebug operator for QSymbianEvent.axis2010-09-022-0/+37
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-027-92/+366
|\ \ | |/ |/| | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Enable the width-for-height codepath and add autotest for WFH. Use hasHeightForWidth() and hasWidthForHeight() instead of sizePolicy() Add hasWidthForHeight in order to support WFH in QGraphicsLayout. Compilation on S60 of external projects depending on private headers
| * Enable the width-for-height codepath and add autotest for WFH.Jan-Arve Sæther2010-09-022-67/+301
| | | | | | | | Task-number: Side-effect of QTBUG-3570
| * Use hasHeightForWidth() and hasWidthForHeight() instead of sizePolicy()Jan-Arve Sæther2010-09-021-14/+24
| | | | | | | | | | | | | | | | | | | | hasHeightForWidth() already does the same check (if the widget has a layout, use the layouts size policy instead of the widgets'). Also generalized the implementation so that it now supports width-for-height. Also fixed a bug where we expected the other dimension to decrease when the first dimension increased. This is not always the case.
| * Add hasWidthForHeight in order to support WFH in QGraphicsLayout.Jan-Arve Sæther2010-09-022-9/+36
| | | | | | | | | | Task-number: Consequence of QT-3570 Reviewed-by: Paul
| * Compilation on S60 of external projects depending on private headersEskil Abrahamsen Blomfeldt2010-09-022-2/+5
| | | | | | | | | | | | | | | | | | Minor change to allow external projects to include qdeclarativeanimation_p_p.h and still compile on Symbian. The inlined constructor with a templated object that contains a call to an non-exported function (execute()) caused a linker error. Reviewed-by: bnilsen
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-0140-99/+655
|\ \ | |/ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Optimize plugin loading on ELF platforms Fix compiler warning in qtextformat.h Add gdb-index section to debug binaries. Clean up and clarify Mac font engine code Implemented suffix and prefix strings for the numbering in ordered lists as supported by ODF. Works also with HTML import/export by using Qt CSS properties extensions.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-0140-99/+655
| |\ |/ / | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Optimize plugin loading on ELF platforms Fix compiler warning in qtextformat.h Add gdb-index section to debug binaries. Clean up and clarify Mac font engine code Implemented suffix and prefix strings for the numbering in ordered lists as supported by ODF. Works also with HTML import/export by using Qt CSS properties extensions.
| * Optimize plugin loading on ELF platformsArvid Ephraim Picciani2010-09-0115-6/+436
| | | | | | | | | | | | | | This is equal to 3c2a43f91e0225bde8d6e6d6076dfe2cddbc2f8e except the alignment checks have been relaxed. Reviewed-by: janarve
| * Fix compiler warning in qtextformat.hEskil Abrahamsen Blomfeldt2010-09-011-4/+4
| | | | | | | | | | | | | | | | When compiling with -Wshadow, function arguments that shadow a class member generate a warning. Change the name in the implementation of the new functions to avoid this warning. Reviewed-by: Samuel
| * Add gdb-index section to debug binaries.Arvid Ephraim Picciani2010-08-3112-11/+24
| | | | | | | | | | | | | | Speeds up debugging on platforms with recent gdb. Task-number: QTCREATORBUG-2215 Reviewed-by: ossi
| * Clean up and clarify Mac font engine codeJiang Jiang2010-08-312-74/+2
| | | | | | | | Reviewed-by: Eskil
generated by cgit v0.12 at 2025-01-15 05:25:21 (GMT)