summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-2542-240/+631
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-2442-240/+631
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2442-240/+631
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2442-240/+631
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2419-227/+158
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| | | | * | Remove Q_PACKED from QChar and QLocale::Data.Thiago Macieira2010-05-232-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-2133-99/+316
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) 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 close scope while inside assignment only if the last char is a closing brace deprecate undocumented -E option use qtPrepareTool for qdoc unify QMAKE_QMAKE path separator fixing simplify arcane conditional, once again qdoc: Propagate the language information into the XML as before. Removed a change from the 4.7.0 change log. Improve look and feel of itemviews on mac doc: Fixed many broken links. doc: Fixed many broken links. update 4.7.0 changes QPushButton's click area exceeds the button area by far on Mac OS X ...
| | | | | * | remove dead code that will never get called.Lorn Potter2010-05-211-2/+0
| | | | | | |
| | | | | * | add bytes and activeTime to corelwan.Lorn Potter2010-05-212-8/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10875
| | | | | * | fix irix buildOswald Buddenhagen2010-05-203-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10611 Reviewed-by: joerg
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-2028-91/+213
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Removed a change from the 4.7.0 change log. Improve look and feel of itemviews on mac doc: Fixed many broken links. doc: Fixed many broken links. update 4.7.0 changes QPushButton's click area exceeds the button area by far on Mac OS X QApplication::closeAllWindows() should ignore windows being closed Examples: Fix compilation with namespace. Use QApplication::arguments() to check for command line args Added support for .rc files on VS2010. Doc: Updating CSS and JS Docs: added an intro for qml, Quick for Beginners. Fix crash on exit in native wifi plugin on Vista+ when run in debugger.
| | | | | | * | Improve look and feel of itemviews on macJens Bache-Wiig2010-05-201-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These fixes are neccessary and requested by Qt Creator and should go into 4.7.0. The fixes involved is: - positioning of disclosure arrow in treeviews - spacing between icon and text label - added 2 pixel spacing between item view items Note that native cocoa views tend to use 3 pixel spacing. We considered this and decided on leaving it at 2 which is what you see in finder list views, XCode among other places. It also makes the change a bit less radical. Reviewed-by:cduclos Task-number:QTBUG-10190
| | | | | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-206-19/+73
| | | | | | |\ \
| | | | | | | * | QPushButton's click area exceeds the button area by far on Mac OS XCarlos Manuel Duclos Vergara2010-05-205-16/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is the "rounding" of buttons in OSX. To achieve this we add some padding to the buttons, therefore creating an inner rect for the widget. The common hitButton(...) method found in QAbstractButton just checks the normal rect of the widget. What this patch does is to reimplement hitButton(...) in QPushButton, but only for the Mac case. In this reimplemented method I calculate the inner rect and check if the hit point is inside that rect or not. Task-number: QTBUG-10401 Reviewed-by: Richard Moe Gustavsen
| | | | | | | * | QApplication::closeAllWindows() should ignore windows being closedBradley T. Hughes2010-05-201-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is very common to display a dialog in response to a close event. Closing the window again will result in QWidget::close() returning true. This confuses QApplication::closeAllWindows(), since the window is still visible even though it was closed (or is closing). Solve this by ignoring windows that have the is_closing flag set in their widget data. Task-number: QTBUG-7635 Reviewed-by: Denis Dzyubenko
| | | | | | * | | doc: Fixed many broken links.Martin Smith2010-05-2020-43/+42
| | | | | | |/ /
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-202-23/+73
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Docs: added an intro for qml, Quick for Beginners. Fix crash on exit in native wifi plugin on Vista+ when run in debugger.
| | | | | | | * | Fix crash on exit in native wifi plugin on Vista+ when run in debugger.Aaron McCarthy2010-05-202-23/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close the wlanapi handle before main function returns.
* | | | | | | | | 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.
* | | | | | | | | Added autotest for Component.createObject() without Qt.createComponent()Alan Alpert2010-05-242-5/+9
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also augmented the docs for both functions a little. Task-number: QTBUG-10926
* | | | | | | | 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-242-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't crash when assigning a Behavior to a grouped property.Michael Brasser2010-05-242-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10799 Reviewed-by: Aaron Kennedy
* | | | | | | | | Be slightly more verbose on assigning undefined in binding.Warwick Allison2010-05-241-1/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | 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.7Warwick Allison2010-05-2411-92/+42
|\ \ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | Fix TextEdit alignment.Warwick Allison2010-05-242-19/+30
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vertical never worked. Horizontal broke at 633b4b0655bf47b6f5100ee9a6c2f692b0aeb081. Task-number: QTBUG-10895
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-2321-237/+164
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-213-57/+106
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-213-57/+106
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-211-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3315 Reviewed-by: Martin Jones
| * | | | | | | Fix warningsOlivier Goffart2010-05-212-3/+4
| | | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2114-184/+118
| |\ \ \ \ \ \ \
| | * | | | | | | Fixes QGraphicsItem::scroll issuesBjørn Erik Nilsen2010-05-211-140/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v0.12 at 2025-01-21 10:44:16 (GMT)