summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-251-1/+2
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compile with xlC.
| * Fixed compile with xlC.Rohan McGovern2010-05-251-1/+2
| | | | | | | | | | | | | | | | When given `flags |= foo | bar;', where `flags' is a bitfield, xlC says: The bit-field "flags" cannot be bound to a non-const reference `flags |= foo; flags |= bar;' works.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-248-8/+60
|\ \ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Added autotest for Component.createObject() without Qt.createComponent()
| * | Added autotest for Component.createObject() without Qt.createComponent()Alan Alpert2010-05-248-8/+60
| | | | | | | | | | | | | | | | | | Also augmented the docs for both functions a little. Task-number: QTBUG-10926
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2415-30/+80
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Compiler warning Remove incorrect ASSERT Be slightly more verbose on assigning undefined in binding. Doc fixes Don't crash when assigning a Behavior to a grouped property. Get rid of 'noise' when using GL and the top-level item is an Item. Fix visual tests after rename of the qml executable. Do not attempt to setParent of object in a different thread Don't polish QDeclarativeItems.
| * | Compiler warningAaron Kennedy2010-05-241-1/+1
| | | | | | | | | | | | QTBUG-10816
| * | Remove incorrect ASSERTAaron Kennedy2010-05-241-3/+1
| | | | | | | | | | | | QTBUG-10832
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-248-10/+48
| |\ \
| | * | Doc fixesYann Bodson2010-05-242-5/+5
| | | |
| | * | Don't crash when assigning a Behavior to a grouped property.Michael Brasser2010-05-244-1/+38
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10799 Reviewed-by: Aaron Kennedy
| | * | Get rid of 'noise' when using GL and the top-level item is an Item.Michael Brasser2010-05-241-1/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-10911
| | * | Fix visual tests after rename of the qml executable.Michael Brasser2010-05-241-3/+3
| | | |
| * | | Be slightly more verbose on assigning undefined in binding.Warwick Allison2010-05-243-7/+9
| |/ / | | | | | | | | | Task-number: QTBUG-10303
| * | Do not attempt to setParent of object in a different threadWarwick Allison2010-05-241-3/+5
| | | | | | | | | | | | | | | | | | | | | QNetworkAccessManager::setCookieJar used to give an error message, now it documents the behavior and avoids the warning. Task-number: QTBUG-10554
| * | Don't polish QDeclarativeItems.Warwick Allison2010-05-242-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | Avoids unnecessary processing and assumptions we would not want to preserve in the future. Task-number: QTBUG-10217 Reviewed-by: Martin Jones
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-24296-421/+11468
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Check QML files for license headers too. Make compile: include script module for test Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivate Allow resource files to be loaded in WorkerScript Fix TextEdit alignment. Component::createObject() don't attempt to set parent of null object Factor out initialization effects from declarative benchmarks. Remove license headers from test data. Fix FolderListModel parentFolder property's file drive handling Add license headers for .qml files. Ensure QML Global Qt object functions appear in the documentation index doc Also show file/line numbers on XML query errors. Print warnings for xml query syntax errors Clean up Add XmlListModel::get()
| * | Check QML files for license headers too.Warwick Allison2010-05-241-3/+11
| | | | | | | | | | | | (but not test data - no test data has license headers)
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-2416-93/+62
| |\ \
| | * | Make compile: include script module for testBea Lam2010-05-241-1/+1
| | | |
| | * | Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivateBea Lam2010-05-2410-94/+34
| | | |
| | * | Allow resource files to be loaded in WorkerScriptBea Lam2010-05-241-3/+11
| | | |
| | * | Component::createObject() don't attempt to set parent of null objectMartin Jones2010-05-241-4/+6
| | | | | | | | | | | | | | | | | | | | Don't try to set graphics item parent on an object that is not a QGraphicsItem
| | * | Factor out initialization effects from declarative benchmarks.Michael Brasser2010-05-244-0/+19
| | | |
| * | | Fix TextEdit alignment.Warwick Allison2010-05-242-19/+30
| |/ / | | | | | | | | | | | | | | | | | | Vertical never worked. Horizontal broke at 633b4b0655bf47b6f5100ee9a6c2f692b0aeb081. Task-number: QTBUG-10895
| * | Remove license headers from test data.Warwick Allison2010-05-23958-39276/+0
| | | | | | | | | | | | Partial revert of d5a86d924bfe331aeba6465b0f249cd27ef83ad4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-232472-33422/+82636
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-211233-59/+50334
| | |\ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix FolderListModel parentFolder property's file drive handling Add license headers for .qml files. Also show file/line numbers on XML query errors. Print warnings for xml query syntax errors Clean up Add XmlListModel::get()
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-211233-59/+50334
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix FolderListModel parentFolder property's file drive handling Add license headers for .qml files. Also show file/line numbers on XML query errors. Print warnings for xml query syntax errors Clean up Add XmlListModel::get()
| | | * | Fix FolderListModel parentFolder property's file drive handlingJoona Petrell2010-05-214-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3315 Reviewed-by: Martin Jones
| | | * | Add license headers for .qml files.Jason McDonald2010-05-211227-0/+50179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-211235-33396/+32305
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (62 commits) Fix warnings Fix shadow building of spectrum demo Doc: Removed a link to missing external online documentation. Fixes QGraphicsItem::scroll issues Fixes wrong QGraphicsItemCache::boundingRect. changes-4.7.0 updated Revert "Deselect the current selection when the QItemSelectionModel::model is reset." add missing include Fix crash when using fonts in non-gui QApplication Deselect the current selection when the QItemSelectionModel::model is reset. Autotest fix on macosx Compile with gcc 4.0.1 improve Unicode Normalization autotest more subtests for QChar nano optimization of canonicalOrderHelper() fix canonicalOrderHelper() for some corner case use new QChar::requiresSurrogates() instead of hardcoded value prevent fake normalization prefer QChar::*surrogate() over hardcoded values Doc: Updated example license to three clause BSD license. ...
| * | | | Fix warningsOlivier Goffart2010-05-212-3/+4
| | | | |
| * | | | Fix shadow building of spectrum demoRhys Weatherley2010-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2140-249/+465
| |\ \ \ \
| | * | | | Fixes QGraphicsItem::scroll issuesBjørn Erik Nilsen2010-05-213-141/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The biggest and most important issue was that QGraphicsItem::scroll always accelerated the scroll without taking overlapping items or opacity into account, which caused drawing artifacts. We can only do accelerated scrolling if the item is opaque and not overlapped by other items. There's no (sane) way to detect whether an item is opaque or not (similar to Qt::WA_OpaquePaintEvent), which means we cannot support accelerated scrolling unless the item is cached into a pixmap (QGraphicsItem::setCacheMode). The second issue was that QStyleOptionGraphicsItem::exposedRect always contained the whole boundinRect() after an accelerated scroll (even with the QGraphicsItem::ItemUsesExtendedStyleOption flag enabled). Auto test included. Task-number: QTBUG-8378, QTBUG-7703 Reviewed-by: yoann
| | * | | | Fixes wrong QGraphicsItemCache::boundingRect.Bjørn Erik Nilsen2010-05-211-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The boundingRect were in some cases not updated correctly, causing full item exposure. Another problem was that we used QRectF::toRect() instead of QRectF::toAlignedRect() when converting a QRectF to QRect. This commit also reduces the probability of doing pixmap scaling since we only pass an offset to QPainter::drawPixmap, instead of passing target and source rects. Task-number: Required by QTBUG-8378
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-2117-76/+181
| | |\ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: changes-4.7.0 updated Revert "Deselect the current selection when the QItemSelectionModel::model is reset." add missing include Fix crash when using fonts in non-gui QApplication Deselect the current selection when the QItemSelectionModel::model is reset. Autotest fix on macosx Compile with gcc 4.0.1 improve Unicode Normalization autotest more subtests for QChar nano optimization of canonicalOrderHelper() fix canonicalOrderHelper() for some corner case use new QChar::requiresSurrogates() instead of hardcoded value prevent fake normalization prefer QChar::*surrogate() over hardcoded values Fixed an assert in QMenu
| | * | | | changes-4.7.0 updatedJoerg Bornemann2010-05-211-1/+1
| | | | | |
| | * | | | Revert "Deselect the current selection when the QItemSelectionModel::model ↵Olivier Goffart2010-05-214-67/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is reset." This reverts commit 2c1d1c136102a17eef9ae3c4e9f0cf01338306ae. Regressions: TESTCASE_FAIL qtreeview (pulse_win32-msvc2005_windows_xp) TESTCASE_FAIL qtreeview (pulse_win32-msvc2008_windows_xp) TESTCASE_FAIL qtreewidget (pulse_win32-msvc2005_windows_xp) TESTCASE_FAIL qtreewidget (pulse_win32-msvc2008_windows_xp) TESTFUNCTION_FAIL qitemselectionmodel::unselectable (pulse_linux-g++) TESTFUNCTION_FAIL qitemselectionmodel::unselectable (pulse_qws/linux-x86-g++) TESTFUNCTION_FAIL qsortfilterproxymodel::testMultipleProxiesWithSelection (pulse_linux-g++) TESTFUNCTION_FAIL qsortfilterproxymodel::testMultipleProxiesWithSelection (pulse_macx-g++_cocoa_32) TESTFUNCTION_FAIL qsortfilterproxymodel::testMultipleProxiesWithSelection (pulse_qws/linux-x86-g++) TESTFUNCTION_FAIL qsortfilterproxymodel::testMultipleProxiesWithSelection (pulse_win32-msvc2005_windows_xp) TESTFUNCTION_FAIL qsortfilterproxymodel::testMultipleProxiesWithSelection (pulse_win32-msvc2008_windows_xp) TESTFUNCTION_FAIL qtreeview::taskQTBUG_6450_selectAllWith1stColumnHidden (pulse_linux-g++) TESTFUNCTION_FAIL qtreeview::taskQTBUG_6450_selectAllWith1stColumnHidden (pulse_qws/linux-x86-g++) TESTFUNCTION_FAIL qtreeview::taskQTBUG_6450_selectAllWith1stColumnHidden (pulse_win32-msvc2005_windows_xp) TESTFUNCTION_FAIL qtreeview::taskQTBUG_6450_selectAllWith1stColumnHidden (pulse_win32-msvc2008_windows_xp) TESTFUNCTION_FAIL qtreewidget::task191552_rtl (pulse_linux-g++) TESTFUNCTION_FAIL qtreewidget::task203673_selection (pulse_qws/linux-x86-g++) TESTFUNCTION_FAIL qtreewidget::task203673_selection (pulse_win32-msvc2005_windows_xp) TESTFUNCTION_FAIL qtreewidget::task203673_selection (pulse_win32-msvc2008_windows_xp)
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-2120-84/+247
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: add missing include Fix crash when using fonts in non-gui QApplication Deselect the current selection when the QItemSelectionModel::model is reset. Autotest fix on macosx Compile with gcc 4.0.1 improve Unicode Normalization autotest more subtests for QChar nano optimization of canonicalOrderHelper() fix canonicalOrderHelper() for some corner case use new QChar::requiresSurrogates() instead of hardcoded value prevent fake normalization prefer QChar::*surrogate() over hardcoded values Fixed an assert in QMenu
| | | * | | | add missing includeOswald Buddenhagen2010-05-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... as instructed by olivier
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-2019-84/+245
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash when using fonts in non-gui QApplication Deselect the current selection when the QItemSelectionModel::model is reset. Autotest fix on macosx Compile with gcc 4.0.1 improve Unicode Normalization autotest more subtests for QChar nano optimization of canonicalOrderHelper() fix canonicalOrderHelper() for some corner case use new QChar::requiresSurrogates() instead of hardcoded value prevent fake normalization prefer QChar::*surrogate() over hardcoded values Fixed an assert in QMenu
* | | | \ \ \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-217-16/+140
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: My 4.6.3 changes. Added my 4.6.3 changes. My 4.6.3 changes. Add my 4.6.3 changes Fix WebKit version dependency in pkg files Add support for including module specific .pri files as part of qt.prf handling My changelog entries for 4.6.3 Add my changes to the 4.6.3 changes log my changelog for 4.6.3 Switch Symbian^3 QCursor implementation back to 5.0 way fix qmake -project once more
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-05-217-16/+140
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-201-9/+81
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: My 4.6.3 changes. Added my 4.6.3 changes. My 4.6.3 changes.
| | | * | | | | | | My 4.6.3 changes.Trond Kjernåsen2010-05-201-16/+73
| | | | | | | | | |
| | | * | | | | | | Added my 4.6.3 changes.Kim Motoyoshi Kalland2010-05-201-1/+4
| | | | | | | | | |
| | | * | | | | | | My 4.6.3 changes.Samuel Rødal2010-05-201-0/+12
| | | | | | | | | |
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-201-2/+19
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add my 4.6.3 changes
| | | * | | | | | | Add my 4.6.3 changesKent Hansen2010-05-201-2/+19
| | |/ / / / / / /
generated by cgit v0.12 at 2025-09-11 21:35:50 (GMT)