summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'fcda1b785bd7d86011f49bfe96cb22b04202933f' into qt-master-from-4.7Olivier Goffart2010-10-254-232/+352
|\ | | | | | | | | | | | | | | Conflicts: tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp Some tests in tst_qgraphicsgridlayout are commented out because they are failing. See task QTBUG-14693
| * QGraphicsLayoutItem - user set sizes should always override, even if there's ↵John Tapsell2010-10-133-166/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a constraint Notes: * I have had to remove some of the old unit tests because the tested for strange behaviour. Now that height for width items behave more like normal items, it's no longer so easy to calculate what the geometries should be in strangely-sized layouts. * This also fixes alignment of height-for-width objects and adds a unit test for this. This couldn't be done in a seperate commit since the two fixes are related. Merge-request: 847 Reviewed-by: Olivier Goffart
| * QGridLayoutEngine - Rework height-for-width support so that row/col spanning ↵John Tapsell2010-10-133-191/+157
| | | | | | | | | | | | | | | | works Task-number: QTBUG-13547 Reviewed-by: Olivier Goffart Merge-request: 847
* | Merge commit '9f766c977a329c84023a15fc66f52d26ff03447b' into qt-master-from-4.7Olivier Goffart2010-10-250-0/+0
|\ \ | |/ | | | | | | | | With --strategy ours. This commit revert a revert that has not been reverted in master
| * Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""Olivier Goffart2010-10-135-17/+678
| | | | | | | | | | | | | | | | This reverts commit 5bd6f7eb5c7d87c08539b6c2df416990cc417ec7. This is a revert of the revert. It is required apply the merge-request 847, which itself revert back part of this commit but fixing it the (hopefuly) right way
* | Merge commit '9f766c977a329c84023a15fc66f52d26ff03447b^' into qt-master-from-4.7Olivier Goffart2010-10-2512-36/+242
|\ \ | |/
| * Adjust the parent index for the itemsMoved call.Stephen Kelly2010-10-133-4/+17
| | | | | | | | | | | | | | | | | | | | | | Not doing this causes the parent QModelIndexes to be out of sync with the model. The fix in fe350ca756df6392b3d0b7840351fccc89f9ef6f is extended to also use adjusted indexes in the itemMove call. Merge-request: 849 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.Michael Dominic K2010-10-135-12/+20
| | | | | | | | | | Merge-request: 856 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Correctly remove the egl alpha surface flags in meego graphics system.Michael Dominic K2010-10-131-1/+3
| | | | | | | | | | Merge-request: 856 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Proper dither & proper alpha checking.Michael Dominic K2010-10-131-4/+4
| | | | | | | | | | Merge-request: 854 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * In meego graphics system, use always 16bit textures.Michael Dominic K2010-10-131-8/+40
| | | | | | | | | | | | | | Use GL_RGB16 for no-alpha images and RGBA4 for alpha images. Merge-request: 854 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * QCompleter: do not auto complete when directory is changed.Olivier Goffart2010-10-133-6/+87
| | | | | | | | | | | | | | | | | | | | Fixed regression for QCompleter associated with a QFileSystemModel. It would popup a popup each time the directory is changed. This was a regression in Qt 4.7.0, introduced with 319b0262418d74cc416a7d Task-number: QTBUG-14292 Reviewed-by: Thierry
| * tst_qcompleter: Add a test for QFileSystemModelOlivier Goffart2010-10-131-6/+76
| | | | | | | | | | | | Copied from the test for QDirModel Reviewed-by: Thierry
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-222-3/+35
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbian shared memory could not be distinguished by numeric key
| * | Symbian shared memory could not be distinguished by numeric keymread2010-10-222-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a problem where QSharedMemory objects on Symbian could not be distinguished by numeric keys, or keys that differed in any non-alpha way. This is fixed by using the same native key generation system as on other platforms, where a SHA1 hash of the original key is appended to a version of the key with all non-alpha characters stripped. Task-number: QT-3712 Reviewed-by: Shane Kearns
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2216-13/+489
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compiler warnings in qelfparser uic: Add autotests for layout alignment Designer: Support alignment in box and grid layouts.
| * | | Fix compiler warnings in qelfparserArvid Ephraim Picciani2010-10-222-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | from magical conversion to signed int in arithmetics Reviewed-by: Friedemann Kleint
| * | | uic: Add autotests for layout alignmentFriedemann Kleint2010-10-222-0/+132
| | | | | | | | | | | | | | | | Task-number: QTBUG-3120
| * | | Designer: Support alignment in box and grid layouts.Friedemann Kleint2010-10-2212-10/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend ui-format by alignment-attribute for QLayoutItem, handle it in uic and formbuilder. Support in Designer by context menu. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-3120
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-2226-25/+415
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed a newly added autotest for QGraphicsView hover_leave. Fix linux-clang license header Add mkspecs for Clang on Linux and Mac OS X Handle Objective-C/C++ sources in SOURCES gracefully configure: Don't use character class when looking for QMAKE_CONF_COMPILER removed shlobj.h to prevent different redefinitions for Windows Embedded 7 enums are defined as typedefs for Windows Embedded 7 windef.h needs to be include before types.h for Windows Embedded 7 defines GID_* for Windows Embedded 7 WM_GESTURE and WM_GESTURENOTIFY are not defined together for Windows Embedded 7 SPI_GETPLATFORMTYPE not defined for Windows Embedded 7 Make QCompleter return current parent instead of invalid index make QFileDialog completer return proper dirnames in root Make sure QGraphicsSceneHoverLeave event has non-null widget pointer. Designer: Enable morphing into QTextBrowser.
| * | | Fixed a newly added autotest for QGraphicsView hover_leave.Denis Dzyubenko2010-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | This should fix autotests regression on all platforms. There was a very silly typo in the test.
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-2126-25/+415
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix linux-clang license header Add mkspecs for Clang on Linux and Mac OS X Handle Objective-C/C++ sources in SOURCES gracefully configure: Don't use character class when looking for QMAKE_CONF_COMPILER removed shlobj.h to prevent different redefinitions for Windows Embedded 7 enums are defined as typedefs for Windows Embedded 7 windef.h needs to be include before types.h for Windows Embedded 7 defines GID_* for Windows Embedded 7 WM_GESTURE and WM_GESTURENOTIFY are not defined together for Windows Embedded 7 SPI_GETPLATFORMTYPE not defined for Windows Embedded 7 Make QCompleter return current parent instead of invalid index make QFileDialog completer return proper dirnames in root Make sure QGraphicsSceneHoverLeave event has non-null widget pointer. Designer: Enable morphing into QTextBrowser.
| * | | Fix linux-clang license headerTor Arne Vestbø2010-10-211-19/+19
| | | |
| * | | Add mkspecs for Clang on Linux and Mac OS XTor Arne Vestbø2010-10-207-0/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass "-platform unsupported/[macx|linux]-clang" and make sure you have a fairly recent trunk-build of Clang (r116737 or above). The platform is currently unsupported and there may be failing test. You have been warned. Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * | | Handle Objective-C/C++ sources in SOURCES gracefullyTor Arne Vestbø2010-10-203-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We look though SOURCES for Objective-C/C++ source files and if we find any we warn the user and move the offending file to OBJECTIVE_SOURCES. We also don't generate implicit rules for .mm files anymore, since that's not supported by qmake and will break in mysterious ways. Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * | | configure: Don't use character class when looking for QMAKE_CONF_COMPILERTor Arne Vestbø2010-10-201-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
| * | | removed shlobj.h to prevent different redefinitions for Windows Embedded 7Oliver Gutbrod2010-10-201-1/+0
| | | | | | | | | | | | | | | | Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | enums are defined as typedefs for Windows Embedded 7Oliver Gutbrod2010-10-201-0/+3
| | | | | | | | | | | | | | | | Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | windef.h needs to be include before types.h for Windows Embedded 7Oliver Gutbrod2010-10-202-0/+5
| | | | | | | | | | | | | | | | Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | defines GID_* for Windows Embedded 7Oliver Gutbrod2010-10-201-1/+14
| | | | | | | | | | | | | | | | Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | WM_GESTURE and WM_GESTURENOTIFY are not defined together for Windows Embedded 7Oliver Gutbrod2010-10-201-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | SPI_GETPLATFORMTYPE not defined for Windows Embedded 7Oliver Gutbrod2010-10-202-0/+7
| | | | | | | | | | | | | | | | Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | Make QCompleter return current parent instead of invalid indexZeno Albisser2010-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the issue of showing drive D: when completion is used in QFileDialog to display suggestions for folders to change into in path C:/. Task-number: QTBUG-14072 Reviewed-by: Olivier Goffart
| * | | make QFileDialog completer return proper dirnames in rootZeno Albisser2010-10-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was introduced with fa46fa236b5f4a9a5677da2e7464a6b9f8b7b5f3 Reviewed-by: Joao
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-196-9/+68
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Make sure QGraphicsSceneHoverLeave event has non-null widget pointer. Designer: Enable morphing into QTextBrowser.
| | * | | Make sure QGraphicsSceneHoverLeave event has non-null widget pointer.Denis Dzyubenko2010-10-195-8/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When constructing QGraphicsSceneHoverLeave event out of QEvent::Leave we should set the widget pointer to the graphicsview's viewport, th same as we do for other graphicsscene events like QGraphicsSceneMouseEvent. Reviewed-by: Yoann Lopes Reviewed-by: Bjørn Erik Nilsen
| | * | | Designer: Enable morphing into QTextBrowser.Friedemann Kleint2010-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14537
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2116-13/+298
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation with QT_NO_KEYWORDS Replaced sample text for Japanese font Fix the #ifdef position. Deactivate the auto-test on problematic platforms. Enable the unified toolbar with the raster configure: Don't use character class when looking for QMAKE_CONF_COMPILER Moving the resetInternalData slot to QAbstractProxyModel Provide the resetInternalData slot to cleanly reset data in proxy subclasses. Emit beginResetModel before updating the strings. Send the hoverLeave not properly sent on the widget inside QGPW.
| * | | Fix compilation with QT_NO_KEYWORDSOlivier Goffart2010-10-211-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Gabriel
| * | | Replaced sample text for Japanese fontTasuku Suzuki2010-10-201-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous word was improper because it means "lazy" Task-number: QTBUG-14527 Merge-request: 868 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * | | Fix the #ifdef position.Fabien Freling2010-10-203-4/+7
| | | | | | | | | | | | | | | | Reviewed-by: Tor Arne Vestbø
| * | | Deactivate the auto-test on problematic platforms.Alexis Menard2010-10-201-0/+3
| | | | | | | | | | | | | | | | Reviewed-by:TrustMe
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-1914-9/+286
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Enable the unified toolbar with the raster configure: Don't use character class when looking for QMAKE_CONF_COMPILER Moving the resetInternalData slot to QAbstractProxyModel Provide the resetInternalData slot to cleanly reset data in proxy subclasses. Emit beginResetModel before updating the strings. Send the hoverLeave not properly sent on the widget inside QGPW.
| * | | Enable the unified toolbar with the rasterFabien Freling2010-10-196-4/+20
| | | | | | | | | | | | | | | | | | | | engine only in the Cocoa port. Reviewed-by: Tor Arne Vestbø
| * | | configure: Don't use character class when looking for QMAKE_CONF_COMPILERTor Arne Vestbø2010-10-191-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
| * | | Moving the resetInternalData slot to QAbstractProxyModelGabriel de Dietrich2010-10-194-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch provided by Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: gabi Merge-request: 694
| * | | Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2010-10-194-0/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct subclasses of QAbstractItemModel are unnaffected as they can update internal data in a slot connected to the sourceModel's modelReset signal or layoutChanged signal. Reviewed-by: gabi Merge-request: 694
| * | | Emit beginResetModel before updating the strings.Stephen Kelly2010-10-191-1/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: gabi Merge-request: 694
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-192-2/+64
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Send the hoverLeave not properly sent on the widget inside QGPW.
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-182-2/+64
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Send the hoverLeave not properly sent on the widget inside QGPW.
generated by cgit v0.12 at 2024-09-21 14:49:34 (GMT)