summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Update to Phonon overviewGeir Vattekar2010-10-081-19/+0
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-10-064-5/+11
|\
| * Added a project file for the Getting Started with QML and changed theJerome Pasion2010-10-063-2/+6
| | | | | | | | old file name references.
| * Clarified the auto connect enumeration regarding which type ofJerome Pasion2010-10-061-3/+5
| | | | | | | | | | | | | | connection is made. Task-number: QTBUG-14223 Reviewed-by: David Boddie
* | Doc: Fixed doc references to non-existing APIGeir Vattekar2010-10-061-3/+2
| | | | | | | | | | Task-number: QTBUG-13632 Reviewed-by: David Boddie
* | Doc: Fix broken links in QSslConfigurationGeir Vattekar2010-10-061-3/+4
|/ | | | | Task-number: QTBUG-14213 Reviewed-by: David Boddie
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-062-2/+2
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-061845-6418/+14930
| |\
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-0648-353/+789
| | |\
| | * | Doc: Fixing bug in QML tutorialMorten Engvoldsen2010-10-061-1/+1
| | | | | | | | | | | | | | | | The code snippet for the simple button was not correctly linked.
| * | | Doc: Fixing spacing bug in columnsMorten Engvoldsen2010-10-061-1/+1
| | | |
* | | | Added installation section and fixed some whitespace.Jerome Pasion2010-10-061-36/+46
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
* | | | Merge branch '13092010doc' into 4.7Jerome Pasion2010-10-061-1/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch '13092010doc' of scm.dev.nokia.troll.no:qt/qt-doc-team into ↵Jerome Pasion2010-09-16387-6615/+15965
| |\ \ \ | | | | | | | | | | | | | | | 13092010doc
| | * | | Doc: Cleaning up the known issues page. Pointing people to check the online ↵Morten Engvoldsen2010-09-161-120/+5
| | | | | | | | | | | | | | | | | | | | resources.
| | * | | Merge branch '4.7' into 13092010docMorten Engvoldsen2010-09-16386-6495/+15960
| | |\ \ \
| * | | | | Added statement regarding validators and input masks on the same line edit.Jerome Pasion2010-09-141-1/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Bug:QTBUG-11324
| * | | | Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-132-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Tasks: QTBUG-10077
* | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0548-353/+789
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0548-353/+789
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Document and test paintedWidth and paintedHeight properties of Image Add missing license header. Improve test coverage for declarative module. Avoid potential null dereference. Add autotest for reserved words in QML. Prevent crash in XmlListModel when appending an empty role. Remove unused, unexported class. Fix clipping behavior for non-cached text. Compile Only cache textlayout in paint engines that support transformations QmlDebugService: Fix compiler warning about cast from ascii Qt.openUrlExternally should resolve relative URLs. Doc: add missing image. Doc: typographical and spelling errors. Doc: remove unfinished and confusing mention to focus panels. Apply the QStaticText text-caching strategy for QML Documentation: input to Qt.rgba should be from 0-1, not 0-255.
| | * | | | Document and test paintedWidth and paintedHeight properties of ImageYann Bodson2010-10-052-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14197
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0546-353/+739
| | |\ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add missing license header. Improve test coverage for declarative module. Avoid potential null dereference. Add autotest for reserved words in QML. Prevent crash in XmlListModel when appending an empty role. Remove unused, unexported class. Fix clipping behavior for non-cached text. Compile Only cache textlayout in paint engines that support transformations QmlDebugService: Fix compiler warning about cast from ascii Qt.openUrlExternally should resolve relative URLs. Doc: add missing image. Doc: typographical and spelling errors. Doc: remove unfinished and confusing mention to focus panels. Apply the QStaticText text-caching strategy for QML Documentation: input to Qt.rgba should be from 0-1, not 0-255.
| | * | | | Add missing license header.Michael Brasser2010-10-041-0/+41
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0446-353/+698
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Improve test coverage for declarative module. Avoid potential null dereference. Add autotest for reserved words in QML. Prevent crash in XmlListModel when appending an empty role. Remove unused, unexported class. Fix clipping behavior for non-cached text. Compile Only cache textlayout in paint engines that support transformations QmlDebugService: Fix compiler warning about cast from ascii Qt.openUrlExternally should resolve relative URLs. Doc: add missing image. Doc: typographical and spelling errors. Doc: remove unfinished and confusing mention to focus panels. Apply the QStaticText text-caching strategy for QML Documentation: input to Qt.rgba should be from 0-1, not 0-255.
| | | * | | | Improve test coverage for declarative module.Michael Brasser2010-10-049-4/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add additional autotests, and remove unreachable functions.
| | | * | | | Avoid potential null dereference.Martin Jones2010-10-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4030
| | | * | | | Add autotest for reserved words in QML.Michael Brasser2010-10-041-0/+76
| | | | | | |
| | | * | | | Prevent crash in XmlListModel when appending an empty role.Michael Brasser2010-10-043-1/+19
| | | | | | |
| | | * | | | Remove unused, unexported class.Michael Brasser2010-10-043-260/+0
| | | | | | |
| | | * | | | Fix clipping behavior for non-cached text.Michael Brasser2010-10-042-2/+1
| | | | | | |
| | | * | | | CompileAaron Kennedy2010-10-042-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14050
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0128-85/+470
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Only cache textlayout in paint engines that support transformations QmlDebugService: Fix compiler warning about cast from ascii Qt.openUrlExternally should resolve relative URLs. Doc: add missing image. Doc: typographical and spelling errors. Doc: remove unfinished and confusing mention to focus panels. Apply the QStaticText text-caching strategy for QML Documentation: input to Qt.rgba should be from 0-1, not 0-255.
| | | | * | | | Only cache textlayout in paint engines that support transformationsAaron Kennedy2010-10-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14050
| | | | * | | | QmlDebugService: Fix compiler warning about cast from asciiKai Koehne2010-10-011-2/+2
| | | | | | | |
| | | | * | | | Qt.openUrlExternally should resolve relative URLs.Michael Brasser2010-10-015-9/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| | | | * | | | Doc: add missing image.Yann Bodson2010-10-012-7/+7
| | | | | | | |
| | | | * | | | Doc: typographical and spelling errors.Yann Bodson2010-10-0114-28/+28
| | | | | | | |
| | | | * | | | Doc: remove unfinished and confusing mention to focus panels.Yann Bodson2010-10-011-10/+0
| | | | | | | |
| | | | * | | | Apply the QStaticText text-caching strategy for QMLAaron Kennedy2010-10-016-28/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML cannot use QStaticText directly as it doesn't support caching a QTextLayout. QDeclarativeTextLayout is basically a copy of QStaticText that adds this support. Currently this feature is disabled by default (enable with QML_DISABLE_IMAGE_CACHE=1) while we double check the perf consequences of this change. Task-number: QTBUG-14050
| | | | * | | | Documentation: input to Qt.rgba should be from 0-1, not 0-255.Michael Brasser2010-10-011-1/+1
| | | | | | | |
* | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0455-929/+680
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-044-27/+40
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case.
| | * | | | | | | Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case.Chris Meyer2010-10-044-27/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2480 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-10-0412-40/+235
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Build fix for -qtnamespace. Fix compile failure in QtMultimedia. Verify the audio format before trying to open an audio device.
| | * | | | | | | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-10-0414-40/+244
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudioinput_win32_p.cpp
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-302-0/+9
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Build fix for -qtnamespace.
| | | | * | | | | | Build fix for -qtnamespace.Leandro Melo2010-09-302-0/+9
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira (cherry picked from commit b8089f0b7a0fef9318070aea9c8344bfe987bac9)
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-09-2312-35/+235
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix compile failure in QtMultimedia. Verify the audio format before trying to open an audio device.
| | | | * | | | | | Fix compile failure in QtMultimedia.Andrew den Exter2010-09-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAudioFormat::sampleRate() and QAudioFormat::channelCount() weren't introduced until 4.7. Use frequency() and channels() instead. Reviewed-by: Justin McPherson
| | | | * | | | | | Verify the audio format before trying to open an audio device.Andrew den Exter2010-09-2212-35/+235
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing a crash on windows because the buffer and period sizes were worked out to 0 with an invalid sample size and dividing one by the other is division by 0. Task-number: QTMOBILITY-438 Reviewed-by: Justin McPherson
generated by cgit v0.12 at 2025-09-09 23:45:30 (GMT)