summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: reintroducing QML elements table temporarilyMorten Engvoldsen2010-11-041-2/+104
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-11-0417-69/+271
|\
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-039-30/+68
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-0310-50/+159
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: qdoc: Added next and previous links to top of pages. Doc: style tuning Doc: fixing style - tool buttons to bold. Doc: updating the template to support search feature better. Doc: Fixing columns to display all elements in lists - css3 Doc: fixing bugs in style Doc: fixing style for search display and slim fit menus Doc: Fixing bug in sorting script for search results. Doc: Fixed basic language. Doc: Added Windows Vista to the trademark list. Doc: Updated the Java trademark information. Doc: Moved QFileSystemModel example code to the class documentation. Doc: Corrected the name property as it was incorrectly declared.
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-034-3/+25
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Qt/Symbian: QInputDialog layout and size are wrong
| | | * | Qt/Symbian: QInputDialog layout and size are wrongSami Merila2010-11-034-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QInputDialog with anything but QLineEdit as the input widget, will show up as minimal size on device/emulator. Also, the dialog looks bad since the widgets are deployed very close to the dialog borders. As a fix, layout will not get the size policy set on Symbian, but the dialog itself is stretched to occupy screen width and thus, layout grows to occupy the available size. Additionally, style will set layout pixel metrics for dialogs larger than for other widgets, to avoid the layout from putting widgets very close to dialog border. Task-number: QTBUG-14331 Reviewed-by: Janne Anttila
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-035-27/+43
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make the dtd reflect reality Fixed destination path for the S60 feedback plugin. german translation: minor additions + fixes fix qdoc doc generation
| | | * | make the dtd reflect realityOswald Buddenhagen2010-11-021-18/+5
| | | | |
| | | * | Fixed destination path for the S60 feedback plugin.David Boddie2010-11-021-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
| | | * | german translation: minor additions + fixesFrederik Schwarzer2010-11-022-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 902 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | fix qdoc doc generationOswald Buddenhagen2010-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | as a side effect, the target is now named html-docs instead of docs to be consistent with the qt docs.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-031-32/+124
| |\ \ \ \
| | * | | | Doc: using pointer member variables and language changeLeena Miettinen2010-11-031-32/+124
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Reviewed-by: Friedemann Kleint Reviewed-by: Martin Smith
| * | | | Doc: Clarified the lifetime of the session bus connection.David Boddie2010-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira
| * | | | Doc: Added a snippet showing the default BorderImage tiling behavior.David Boddie2010-11-031-0/+55
| | | | |
| * | | | Doc: Added more instructions to help with device file permissions.David Boddie2010-11-032-2/+9
| | | | |
| * | | | Doc: Mentioned default values for the BorderImage tile modes.David Boddie2010-11-031-0/+2
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-03686-59478/+44554
| |\ \ \ \ | | |/ / /
| * | | | Document the difference between +0.0 and -0.0 for QPointF and QSizeF.David Boddie2010-11-032-2/+10
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Robert Griebl
* | | | | Doc: Correcting character escape bugMorten Engvoldsen2010-11-041-1/+1
| |/ / / |/| | |
* | | | qdoc: Added next and previous links to top of pages.Martin Smith2010-11-031-3/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-14979
* | | | Doc: style tuningMorten Engvoldsen2010-11-031-1/+1
| | | |
* | | | Doc: fixing style - tool buttons to bold.Morten Engvoldsen2010-11-031-1/+1
| | | |
* | | | Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
| | | |
* | | | Doc: Fixing columns to display all elements in lists - css3Morten Engvoldsen2010-11-031-2/+2
| | | |
* | | | Doc: fixing bugs in styleMorten Engvoldsen2010-11-022-2/+7
| | | |
* | | | Doc: fixing style for search display and slim fit menusMorten Engvoldsen2010-11-021-3/+73
| | | |
* | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-0180-5677/+12165
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-018-81/+376
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set Fix compilation on AIX 5.3 with gcc Doc: Fixed typo Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-018-81/+376
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: tst_qnetworkreply with setReadBufferSize() set Fix compilation on AIX 5.3 with gcc Doc: Fixed typo Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| | * | QNAM HTTP: tst_qnetworkreply with setReadBufferSize() setDavid Faure2010-11-011-71/+366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new method tests 4 cases (http/https, with/without buffer size) and checks the send/receive rates to check that the actual transfer rate was limited, not just the speed of emission of data to the application. Task-number: QTBUG-6276 Merge-request: 872 Reviewed-by: Markus Goetz <Markus.Goetz@nokia.com>
| | * | Fix compilation on AIX 5.3 with gccKent Hansen2010-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "error: invalid pointer to bit-field `QAbstractStatePrivate::isMachine'" The extra qualification is not needed anyway, so remove it. Task-number: QTBUG-14491 Reviewed-by: Eskil Abrahamsen Blomfeldt
| | * | Doc: Fixed typoThorbjørn Lindeijer2010-11-011-1/+1
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-015-8/+8
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix poor English in QStyle::polish documentation. Fix a few typos in comments and docs.
| | | * | Fix poor English in QStyle::polish documentation.Jason McDonald2010-11-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10538 Reviewed-by: Trust Me
| | | * | Fix a few typos in comments and docs.Jason McDonald2010-11-014-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13714 Reviewed-by: Trust Me
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-013-1/+60
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Quickly clicking an item that doesn't use double clicking should result in two separate clicks
| | * | | | Quickly clicking an item that doesn't use double clicking should result in ↵Joona Petrell2010-11-013-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | two separate clicks Task-number: QTBUG-14832 Reviewed-by: Martin Jones
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-011-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix OpenVG painting artifacts after restoreState().
| | * | | | Fix OpenVG painting artifacts after restoreState().Jason Barron2010-11-011-0/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the state is restored and the 'dirty' flag indicates that the clip state has changed, the paint engine needs to set 'scissorDirty' flag to true so that updateScissor() applies the restored clip region to the scissor rects. Task-number: QTBUG-14907 Reviewed-by: Jani Hautakangas
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0168-5595/+11728
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix QML visual tests on Mac.
| | * | Fix QML visual tests on Mac.Yann Bodson2010-11-0168-5595/+11728
| |/ / | | | | | | | | | Task-number: QTBUG-14792
* | | Doc: Fixing bug in sorting script for search results.Morten Engvoldsen2010-11-011-3/+3
| | | | | | | | | | | | Reviewed-by: Geir Vattekar
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-304-12/+53
|\ \ \ | |/ /
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-10-302-0/+36
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Fix Windows compilation. Fixed race condition in raster paint engine.
| | * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-302-0/+36
| | |\ \ | |/ / / | | | | | | | | | | | | Conflicts: tests/auto/qpainter/tst_qpainter.cpp
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-272-0/+36
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix Windows compilation. Fixed race condition in raster paint engine.
| | | * | Fix Windows compilation.Samuel Rødal2010-10-272-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't take for granted that these are included... Task-number: QTBUG-14614 Reviewed-by: Bradley T. Hughes
| | | * | Fixed race condition in raster paint engine.Samuel Rødal2010-10-272-0/+34
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | We need to protect the gradient cache accesses with a mutex. Task-number: QTBUG-14614 Reviewed-by: Bradley T. Hughes
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-292-12/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: dbus does not use this. fix build. Fix memory leak on exit