summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-218-18/+142
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-21100-280/+1594
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | | | | * | | qdoc: Fixed html error, but the problem is still there.Martin Smith2010-05-211-1/+1
| | | | | | | |
| | | | | * | | qdoc: Changed number of columns to 1. Oila!Martin Smith2010-05-211-1/+1
| | | | | | | |
| | | * | | | | Doc: design changesMorten Engvoldsen2010-05-213-13/+16
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Fixing menus and js
| | | * | | | Doc: Changes to the HTMLGenerator, style and jsMorten Engvoldsen2010-05-2114-24/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing tables with lists in the HTML generator Adding img to search box Moving JS from template to script files
| | | * | | | 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
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-2188-249/+1454
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (22 commits) 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 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 ...
| | | | * | | | Fix formating of license header.Aaron McCarthy2010-05-201-4/+2
| | | | | | | |
| | | | * | | | fix irix buildOswald Buddenhagen2010-05-203-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10611 Reviewed-by: joerg
| | | | * | | | clarify wording of warning messageOswald Buddenhagen2010-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | | | * | | | close scope while inside assignment only if the last char is a closing braceOswald Buddenhagen2010-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the code assumed it anyway and would make a mess if it was wrong Reviewed-by: joerg
| | | | * | | | deprecate undocumented -E optionOswald Buddenhagen2010-05-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | | | * | | | use qtPrepareTool for qdocOswald Buddenhagen2010-05-201-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | | | * | | | unify QMAKE_QMAKE path separator fixingOswald Buddenhagen2010-05-202-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the value of the variable in Option is only ever accessed via the project variable, so there is no point in early fixing. as it happens, this fixes mingw+sh generating makefiles with the wrong separator, as the fixing is delayed to a point where QMAKE_DIR_SEP was read back into Option. Reviewed-by: joerg
| | | | * | | | simplify arcane conditional, once againOswald Buddenhagen2010-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-05-20908-59997/+21750
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-2080-223/+1441
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | | * | | | Removed a change from the 4.7.0 change log.Kim Motoyoshi Kalland2010-05-201-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change belongs in the 4.6.3 change log.
| | | | | | * | | | 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
| | | | | | * | | | doc: Fixed many broken links.Martin Smith2010-05-2016-64/+63
| | | | | | | | | |
| | | | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-2017-22/+173
| | | | | | |\ \ \ \
| | | | | | | * | | | update 4.7.0 changesKent Hansen2010-05-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mistakenly added something that was fixed for 4.6.3 (it's been moved to changes-4.6.3 in a different branch).
| | | | | | | * | | | 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-202-3/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | * | | | Examples: Fix compilation with namespace.ck2010-05-209-1/+22
| | | | | | | | | | |
generated by cgit v0.12 at 2025-02-02 00:06:56 (GMT)