summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-265-1/+56
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes selection being cleared when right clicking on a selected item. QCheckBox did not have a minimumSizeHint()
| * Fixes selection being cleared when right clicking on a selected item.Yoann Lopes2010-04-262-1/+39
| | | | | | | | | | | | | | Autotest included. Task-number: QTBUG-10138 Reviewed-by: bnilsen
| * QCheckBox did not have a minimumSizeHint()Jan-Arve Sæther2010-04-263-0/+17
| | | | | | | | | | | | | | | | | | | | | | Fortunately the *default* horizontal size policy was QSizePolicy::Minimum. However if the size policy was set to for instance Preferred it could shrink down until it disappeared. The following patch will do the same as QLabel does it: sizeHint is the same as minimumSizeHint. Task-number: QTBUG-2606 Reviewed-by: Gabriel
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-04-262-0/+133
|\ \ | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Added mkspec for MSVC 2010
| * | Added mkspec for MSVC 2010Martin Petersson2010-04-262-0/+133
| | | | | | | | | | | | Reviewed-by: Marius SO
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-238-18/+170
|\ \ \ | | |/ | |/| | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Implement heightForWidth support for QTabWidget and QStackedWidget.
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Jan-Arve Sæther2010-04-2328-60/+473
| |\ \ | |/ / |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Minor optimisation in QMenu
| * | | Minor optimisation in QMenuTom Cooksey2010-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Stops the QMenu re-painting itself for every mouse move event. Reviewed-By: gabi
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-2326-58/+472
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Fix strerror_r in case it returns a pointer that is not our buffer" Designer: Fix cardinality error in stringlist properties in ui4 schema. [qtconfig app] Add an app icon. Mac: Remove Ctrl+Y as redo shortcut. Fix strerror_r in case it returns a pointer that is not our buffer [networkselftest] Verify some CGIs on the test server [networkselftest] Verify the presence and size of some files on HTTP [networkselftest] Verify PUT and DELETE commands and the protected area in HTTP [networkselftest] Enchance test to verify the layout of the FTP server. [networkselftest] Add a test for the FTP proxy server [networkselftest] Add a test to try the SMB server. [networkselftest] Add the FTP proxy and SMB ports to the test. Add new QDataStream version for Qt 4.8. Long live Qt 4.8!
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-2226-58/+472
| |\ \ \ \ |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Fix strerror_r in case it returns a pointer that is not our buffer" Designer: Fix cardinality error in stringlist properties in ui4 schema. [qtconfig app] Add an app icon. Mac: Remove Ctrl+Y as redo shortcut. Fix strerror_r in case it returns a pointer that is not our buffer [networkselftest] Verify some CGIs on the test server [networkselftest] Verify the presence and size of some files on HTTP [networkselftest] Verify PUT and DELETE commands and the protected area in HTTP [networkselftest] Enchance test to verify the layout of the FTP server. [networkselftest] Add a test for the FTP proxy server [networkselftest] Add a test to try the SMB server. [networkselftest] Add the FTP proxy and SMB ports to the test. Add new QDataStream version for Qt 4.8. Long live Qt 4.8!
| * | | | Revert "Fix strerror_r in case it returns a pointer that is not our buffer"Thiago Macieira2010-04-221-1/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 56891588a23adfe4ac6a8fbe01083464dc67e79b.
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-2227-60/+473
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Designer: Fix cardinality error in stringlist properties in ui4 schema. [qtconfig app] Add an app icon. Mac: Remove Ctrl+Y as redo shortcut. Fix strerror_r in case it returns a pointer that is not our buffer [networkselftest] Verify some CGIs on the test server [networkselftest] Verify the presence and size of some files on HTTP [networkselftest] Verify PUT and DELETE commands and the protected area in HTTP [networkselftest] Enchance test to verify the layout of the FTP server. [networkselftest] Add a test for the FTP proxy server [networkselftest] Add a test to try the SMB server. [networkselftest] Add the FTP proxy and SMB ports to the test. Add new QDataStream version for Qt 4.8. Long live Qt 4.8!
| | * | | | Designer: Fix cardinality error in stringlist properties in ui4 schema.Friedemann Kleint2010-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-1621
| | * | | | [qtconfig app] Add an app icon.Thiago Macieira2010-04-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Mario Carrion for the patch. Task-number: QTBUG-10099 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | | Mac: Remove Ctrl+Y as redo shortcut.Morten Johan Sørvig2010-04-221-3/+2
| | | | | |
| | * | | | Fix strerror_r in case it returns a pointer that is not our bufferThiago Macieira2010-04-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10014 Reviewed-by: Trust Me
| | * | | | [networkselftest] Verify some CGIs on the test serverThiago Macieira2010-04-221-0/+72
| | | | | |
| | * | | | [networkselftest] Verify the presence and size of some files on HTTPThiago Macieira2010-04-221-1/+40
| | | | | |
| | * | | | [networkselftest] Verify PUT and DELETE commands and the protected area in HTTPThiago Macieira2010-04-221-0/+79
| | | | | |
| | * | | | [networkselftest] Enchance test to verify the layout of the FTP server.Thiago Macieira2010-04-221-0/+27
| | | | | |
| | * | | | [networkselftest] Add a test for the FTP proxy serverThiago Macieira2010-04-221-2/+8
| | | | | |
| | * | | | [networkselftest] Add a test to try the SMB server.Thiago Macieira2010-04-221-0/+57
| | | | | |
| | * | | | [networkselftest] Add the FTP proxy and SMB ports to the test.Thiago Macieira2010-04-221-1/+3
| | | | | |
| | * | | | Add new QDataStream version for Qt 4.8.Jason McDonald2010-04-221-3/+4
| | | | | |
| | * | | | Long live Qt 4.8!Jason McDonald2010-04-2221-47/+177
| | | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-221-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix merge of qtextureglyphcache.cpp
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-04-2214-12/+14
| |\ \ \ \
| * | | | | Fix merge of qtextureglyphcache.cppEskil Abrahamsen Blomfeldt2010-04-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge in 1ffc19d083a82c3f717e4f091a3af7b0241b6a6d introdcued two different versions of the m_cy calculation simultaneously. Remove the older version and keep the new. Reviewed-by: TrustMe
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-04-220-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Add missing QT namespace. In the way of merges. Remove.
| * \ \ \ \ \ Merge branch 'master' of git:qt/qt-qmlThiago Macieira2010-04-220-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| | * | | | | | Add missing QT namespace.Wolfgang Beck2010-03-081-0/+4
| | | | | | | |
| | * | | | | | Merge branch '4.7'Warwick Allison2010-03-03268-1634/+3976
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/multimedia/qmldir src/imports/webkit/qmldir src/imports/widgets/qmldir
| | * | | | | | | In the way of merges. Remove.Warwick Allison2010-03-033-3/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-2219-16/+100
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added 'parallel_test' for some QGraphics* auto-tests. QAbstractGraphicsShapeItem: ignore already set pen or brush Made sure that QTabWidget reported a big enough size hint. Fixed wasted space in the texture cache. Get debug code compiling since function signature changes --warn;
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-04-220-0/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compiler warnings when compiling multimedia module.
| * | | | | | | Merge branch 'master' of git:qt/qt-multimedia-stagingThiago Macieira2010-04-220-0/+0
| |\ \ \ \ \ \ \ |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/qml/qsoundeffect_qsound_p.cpp tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * | | | | | | Fixed compiler warnings when compiling multimedia module.Kurt Korbatits2010-03-023-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Andrew den Exter
| | | | | | | * Implement heightForWidth support for QTabWidget and QStackedWidget.Jan-Arve Sæther2010-04-228-18/+170
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was simply that QTabWidget does not have a layout (it does manual layouting, and since that the heightForWidth implementation it inherits from QWidget require that the widget has a layout it will not work and it always returned -1 for QTabWidget). The solution is then to reimplement heightForWidth(). Unfortunately the patch has several workarounds for BIC: 1. QWidget::hasHeightForWidth() should really have been virtual. Instead we add the virtual QWidgetPrivate::hasHeightForWidth(). Since this is a workaround/bugfix for QTabWidget we decided to keep QWidget::hasHeightForWidth() internal for now. 2. We cannot reimplement a virtual function in QStackedLayout. We therefore fix QStackedWidget by subclassing QStackedLayout and reimplement the virtual functions in the subclass. This is not an ideal fix, but improves QTabWidget and QStackedWidget wrt height for width. Task-number: QTBUG-7792 Reviewed-by: Paul Reviewed-by: Olivier
| | * | | | | Added 'parallel_test' for some QGraphics* auto-tests.Yoann Lopes2010-04-2214-12/+14
| | | |_|/ / | | |/| | |
| | * | | | Merge branch 'master' of git:qt/oslo-staging-2Thiago Macieira2010-04-225-4/+86
| | |\ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache.cpp
| | * | | | QAbstractGraphicsShapeItem: ignore already set pen or brushMarkus Hossner2010-04-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If setPen() or setBrush() of a QAbstractGraphicsShapeItem is called with a pen or brush equal to its current pen or brush prepareGeometryChange() and update() shouldn't be called. Testing for identical pen and brush is cheap in comparison with a QGraphicsView update() without seeing a change Merge-request: 562 Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
| | * | | | Made sure that QTabWidget reported a big enough size hint.Jan-Arve Sæther2010-04-213-4/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids some minor clipping issues observed (see autotest). Reviewed-by: MortenS
| | * | | | Fixed wasted space in the texture cache.Gunnar Sletta2010-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using the height of the texture to position the next row, rather than just adding the rowHeight. This used to work when the texture cached grew by rowHeight, now it grows to next power of two... Reviewed-by: Eskil
| | * | | | Get debug code compiling since function signature changesGunnar Sletta2010-03-151-10/+4
| | | | | |
| | * | | | --warn;Gunnar Sletta2010-03-122-6/+6
| | | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-221-3/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QSettings: Fix isWritable incorrectly returning true on linux.
| * | | | | QSettings: Fix isWritable incorrectly returning true on linux.Christian Kamm2010-04-211-3/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the target directory exists and is readable, QConfFile::isWritable used to returned true, even though the actual config file was not necessarily writable. Reviewed-by: joerg
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-2111-21/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebKit: Fixes compilation on MSVC 64 QtWebKit: Remove translatable strings from tests/hybridPixmap. Remove overloaded placement new operators WINSCW compiler fix, too eager to solve inlines WINSCW boolean fix for XPATH WINSCW compile fix for HashMap WINSCW compile fix for WebCore
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-2011-21/+36
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebKit: Fixes compilation on MSVC 64 QtWebKit: Remove translatable strings from tests/hybridPixmap. Remove overloaded placement new operators WINSCW compiler fix, too eager to solve inlines WINSCW boolean fix for XPATH WINSCW compile fix for HashMap WINSCW compile fix for WebCore
generated by cgit v0.12 at 2025-09-12 13:05:56 (GMT)