summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused function in QDBusConnectionPrivateThiago Macieira2010-05-252-9/+0
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-251-0/+4
|\
| * Updating 4.7.0 change log.Bjørn Erik Nilsen2010-05-251-0/+4
| |
* | Doc: Fixing bugs in HTML generatorMorten Engvoldsen2010-05-251-4/+4
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-251564-34675/+44400
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-255-11/+19
| |\
| | * Added MSVC 2010 project files to .gitignoreJohn Brooks2010-05-251-0/+2
| | | | | | | | | | | | | | | Merge-request: 2394 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Fix architecture detection on GNU/Hurd.Pino Toscano2010-05-251-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | On GNU/Hurd, `uname -m` returns a string like "i686-AT386", which is not recognized. Instead, do a specific mangling on "GNU" host, the same done by autotools' config.guess, so the architecture can be identified and the proper atomic primitives used. Merge-request: 638 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-25109-426/+1924
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (40 commits) Revert "tst_bic: make it possible to test for cross-compilation" fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. Fixing incorrect addition of public API symbols. Removal erroneous inclusion of new Public API in qmacstyle. Doc: design changes qdoc: Fixed html error, but the problem is still there. qdoc: Changed number of columns to 1. Oila! Doc: Changes to the HTMLGenerator, style and js remove dead code that will never get called. add bytes and activeTime to corelwan. Fix formating of license header. fix irix build ...
| | | * Revert "tst_bic: make it possible to test for cross-compilation"Thiago Macieira2010-05-252-10/+4
| | | | | | | | | | | | | | | | This reverts commit b5f1a55c3112f46f27e2306fac7d93bde96152e6.
| | * | 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.
| * | | | qdoc: Improved class index page.Martin Smith2010-05-253-648/+120
| | |_|/ | |/| | | | | | | | | | The classes.html page will look good with the correct css.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-24111-430/+1934
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits) fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. Fixing incorrect addition of public API symbols. Removal erroneous inclusion of new Public API in qmacstyle. Doc: design changes qdoc: Fixed html error, but the problem is still there. qdoc: Changed number of columns to 1. Oila! Doc: Changes to the HTMLGenerator, style and js remove dead code that will never get called. add bytes and activeTime to corelwan. Fix formating of license header. fix irix build clarify wording of warning message ...
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-24111-430/+1934
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits) fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. Fixing incorrect addition of public API symbols. Removal erroneous inclusion of new Public API in qmacstyle. Doc: design changes qdoc: Fixed html error, but the problem is still there. qdoc: Changed number of columns to 1. Oila! Doc: Changes to the HTMLGenerator, style and js remove dead code that will never get called. add bytes and activeTime to corelwan. Fix formating of license header. fix irix build clarify wording of warning message ...
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-24111-430/+1934
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits) fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. Fixing incorrect addition of public API symbols. Removal erroneous inclusion of new Public API in qmacstyle. Doc: design changes qdoc: Fixed html error, but the problem is still there. qdoc: Changed number of columns to 1. Oila! Doc: Changes to the HTMLGenerator, style and js remove dead code that will never get called. add bytes and activeTime to corelwan. Fix formating of license header. fix irix build clarify wording of warning message ...
| | | | * | fix typo in documentationAlex2010-05-241-1/+1
| | | | | |
| | | | * | Improve Bearer Management related documentation in QNetworkAccessManagerAlex2010-05-241-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-241235-33396/+32305
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qmacstyle_mac.mm
| | | | * | | Compile with QT_NO_ACTION.Tasuku Suzuki2010-05-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 643 Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
| | | | * | | Unbreak compilation outside MacThiago Macieira2010-05-231-1/+1
| | | | | | |
| | | | * | | QDBusAbstractInterface: don't set lastError outside the object's own threadThiago Macieira2010-05-231-1/+4
| | | | | | |
| | | | * | | tst_bic: make it possible to test for cross-compilationThiago Macieira2010-05-232-4/+10
| | | | | | |
| | | | * | | Remove Q_PACKED from QChar and QLocale::Data.Thiago Macieira2010-05-233-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | | | * | | QDebug operator for QFlagsHarald Fernengel2010-05-211-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output the flags one by one instead of just an integer Reviewed-by: Robert Griebl
| | | | * | | Removing unneeded qDebug statement.Carlos Manuel Duclos Vergara2010-05-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Richard Moe Gustavsen
| | | | * | | Fixing incorrect addition of public API symbols.Carlos Manuel Duclos Vergara2010-05-217-181/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is related to 49a6f4a7d87def3816cebf0115ddadf43e9c4d01 and contains all the files that were modified. The previous commit contained only the newly added file. Reviewed-by: jbache
| | | | * | | Removal erroneous inclusion of new Public API in qmacstyle.Carlos Manuel Duclos Vergara2010-05-211-0/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When fixing qtbug-10401 I introduced some extra symbols in the public API. This commit fixes that and moves those symbols to QMacStylePrivate instead. Reviewed-by: jbache
| * | | | | | 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
generated by cgit v0.12 at 2025-09-11 07:31:45 (GMT)