summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-173-7/+14
|\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: PathView doesn't update if preferred highlight range changes. Image.PreserveAspectFit has unexpected effect on Image's sourceSize Doc improvement for Image.fillMode.
| * PathView doesn't update if preferred highlight range changes.Martin Jones2011-03-171-0/+2
| | | | | | | | | | | | | | | | Simply call refill() when they change. Change-Id: I45ab56cbcaf5c726ce4c4f23f66ee687a6d89dad Task-number: QTBUG-15356 Reviewed-by: Kevin Wu Won
| * Image.PreserveAspectFit has unexpected effect on Image's sourceSizeMartin Jones2011-03-172-5/+7
| | | | | | | | | | | | | | | | | | | | | | The sourceSize should always be the size of the image, unless set otherwise. When calculating the size of an image with Image.PreserveAspectFit set the natural image size should be used for the calculation if no size has been set explicitly. Change-Id: I104b7d1c3c16aa5b4fc98b1f9078ed8ae997cf69 Task-number: QTBUG-16389 Reviewed-by: Joona Petrell
| * Doc improvement for Image.fillMode.Yann Bodson2011-03-171-2/+5
| | | | | | | | | | Change-Id: I2aec2c9fae07a8551001b2c7d5f5ab8da0fbb7df Task-number: QTBUG-14899
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-172-0/+9
|\ \ | |/ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeView flickers when composited on MeeGo Re-enable lineHeight tests.
| * QDeclarativeView flickers when composited on MeeGoMartin Jones2011-03-172-0/+9
| | | | | | | | | | | | | | | | | | Set Qt::WA_OpaquePaintEvent and Qt::WA_NoSystemBackground for QDeclarativeView on meego. Change-Id: I301d2381ae831485d205ff42b0c15b3fa7a73424 Task-number: QTBUG-17173 Reviewed-by: Michael Brasser
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-03-164-8/+26
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Introduce QGraphicsItem::ItemStopsFocusHandling flag
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Jan-Arve Sæther2011-03-16140-910/+3690
| |\ \
| * | | Introduce QGraphicsItem::ItemStopsFocusHandling flagMichael Hasselmann2011-03-164-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When set for an item, QGraphicsScene will skip focus handling for this item and everything underneath it (including focus-out). Allows users to reimplement custom focus handling. Use case: touch devices that implement panning. Here, focus-in has to happen only if no panning was triggered. Analogous, no focus-out should happen when panning was detected. Fixes the alternative proposal ("black holes for focus changes") of QTBUG-16343: QGraphicsView doesn't support focus change on mouse release. The previous test was only testing one scenario, which didn't give a good idea whether the flag was actually working as intended. Task-number: QTBUG-17505 Reviewed-by: Yoann Lopes Reviewed-by: Jan-Arve Sæther
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-161-18/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix for wrong dpi metrics for raster pixmaps on Symbian.
| * | | | Fix for wrong dpi metrics for raster pixmaps on Symbian.Laszlo Agocs2011-03-161-18/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original implementation relied on SizeInTwips() for the underlying bitmap which unfortunately returns 0, leading to incorrect results from QPixmap::logicalDpiX/Y(). This caused issues in text rendering onto pixmaps (QTBUG-17628). This fix changes QS60PixmapData to use a slightly different metrics() implementation (the one VG and GL PixmapData are using). Task-number: QTBUG-18154 Reviewed-by: Jani Hautakangas
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-162-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Qt.include() used in WorkerScript is broken on Windows.
| * | | | Qt.include() used in WorkerScript is broken on Windows.Martin Jones2011-03-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script local filename was used to resolve the source URL rather than the script URL. Change-Id: I78aa23eadbd76e100bb872b6ac9459aa9a5ee5ce Task-number: QTBUG-17977 Reviewed-by: Aaron Kennedy
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-164-16/+179
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMeeGoLivePixmapData : when creating QImage, use constructor with pitch. Added automatic graphicssystem switching on meego when app is minimized.
| * | | | | QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.Tapani Pälli2011-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the data may be aligned/padded by the X driver. Fixes: NB#231246 : Incorrect stride used when QMeeGoLivePixmap width not multiple of eight Merge-request: 1115 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | Added automatic graphicssystem switching on meego when app is minimized.Samuel Rødal2011-03-163-15/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When all top-level widgets are minimized we switch to raster to reduce GPU memory consumption. We switch back to graphicssystem meego when at least one top-level widget is shown normally again. The switching only applies when the runtime graphicssystem is being used. The switching only applies when the runtime graphicssystem is being used. Task-number: QTBUG-18013 Reviewed-by: Armin Berres
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-161-3/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Disabled non-QDeclarativeItems in Flickable break flicking
| * | | | | Disabled non-QDeclarativeItems in Flickable break flickingMartin Jones2011-03-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Flickable to steal grab from items that are disabled. Change-Id: I71e401cd78695ecb2c3d47abde1c3d13e722d848 Task-number: QT-4677 Reviewed-by: Michael Brasser
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-1515-19/+1484
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Hot fix for compilation without QGL_USE_TEXTURE_POOL Initial implementation of GLES2.0 resource pooling
| * | | | | Hot fix for compilation without QGL_USE_TEXTURE_POOLJani Hautakangas2011-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| * | | | | Initial implementation of GLES2.0 resource poolingJani Hautakangas2011-03-1515-19/+1482
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the implementation in separate qpixmapdata_poolgl.cpp file until the pooling has been verified and confirmed to work ok. Task-number: QTBUG-15253 QTBUG-17850 Reviewed-by: Samuel Rødal
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-151-22/+25
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Designer: Fix a bug affecting tab reordering of promoted tab widgets. Designer: Fix a bug clearing the Z-Order when adding a new widget. Adjust right bearing when breaking with line separators
| * | | | | Adjust right bearing when breaking with line separatorsJiang Jiang2011-03-151-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we found a forced line break with line separator (e.g. '\n'), take the right bearing of previous glyph into account, otherwise the resulting text width will be slightly smaller than the one without a line separator. Task-number: QTBUG-17020 Reviewed-by: Eskil
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-1511-43/+63
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (46 commits) Fix the license info for bin/elf2e32_qtwrapper.pl. Avoid panics in QDesktopWidget on Symbian emulator. QS60Style: use placeholder texture when polishing widgets and palette Regression: QS60Style: Theme background is incorrect Remove changes from fix to QTBUG-17045 that were not related to the fix Prevent null pointer crash when closing splitview QS60Style slows down layout switch by updating widgets unnecessarily Fix qgraphicstransform autotest for Symbian, where qreal is float. Removed reference to nonexistant profile. Disable capabilities example for symbian-gcce due to a bug in elf2e32 Readded a ';;' that was removed by mistake. Fixed mkspec detection for Symbian. Removed javascript-jit from default symbian-gcce build. Corrected a mismerge in GCCE link parameters. Fixed incorrect referral to an include file. Fixed win32-msvc2008 build regression. Made qmake strip trailing \ from libdirs. Fixed GCCE libdir handling if the paths have spaces in them. Added MinGW support for adding lib prefix and extension via profile. Added support for various special compiler/linker flags on MinGW. ...
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-151-6/+8
| |\ \ \ \ \
| | * | | | | Avoid panics in QDesktopWidget on Symbian emulator.Laszlo Agocs2011-03-151-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is usually only one screen on the emulator and it was incorrectly assumed that ScreenDevice() would return null for a non-existing screen. It panics instead so the entire call must be skipped. Reviewed-by: Sami Merila
| * | | | | | QS60Style: use placeholder texture when polishing widgets and paletteSami Merila2011-03-153-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background texture is not created until it is actually painted. This allows skipping the whole background texture creation, if app overwrites the QPalette::Window with its own data (image or color). When widget is drawn and style notices that the widget is still using a placeholder (1*1 red QPixmap) texture, it creates the real texture and uses that for drawing. Note that accessing QPalette::Window will give the placeholder pixmap. Which is then again replaced with the real texture, if it is drawn through the qt_s60_fill_background(). Task-number: QTBUG-14910 Reviewed-by: Laszlo Agocs
| * | | | | | Regression: QS60Style: Theme background is incorrectSami Merila2011-03-151-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for QTBUG-16816 cause theme background to display incorrectly after a layout switch is done. Theme background is shown "tiled" instead of being whole screen size. This is because the setBackgroundTexture() call was removed to "save" QPixmap creation. Unfortunately, it really skips the background texture creation, but does not re-create a new one for the new layout, so portrait background is used again. This leads to tiling the image. Let's just return the call to the setBackgroundTexture() (this will eventually anyway be "optimized" with fix for QTBUG-14910). Task-number: QTBUG-17930 Reviewed-by: Laszlo Agocs
| * | | | | Remove changes from fix to QTBUG-17045 that were not related to the fixSami Merila2011-03-151-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were changes included in the fix for QTBUG-17045 that were not supposed to be part of that fix. These changes to qcombobox.cpp are now removed. Task-number: QTBUG-17045 Reviewed-by: TrustMe
| * | | | | Prevent null pointer crash when closing splitviewSami Merila2011-03-152-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents crash when focus item is not set and splitview is closed. This is partial fix to QTBUG-17045. Task-number: QTBUG-17045 Reviewed-by: Guoqing Zhang
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-146-7/+19
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-146-7/+19
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | | * | | | | Fixed a typo in src profile.axis2011-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | * | | | | Fixed a build library deployment issue in sqlite.axis2011-03-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make did not understand that sqlite3.dso, which the link relies on, is the same as $$OBJECTS_DIR/sqlite3.dso, which is extracted by the profile. RevBy: Trust me
| | | * | | | | Fixed include in network module on Symbian.axis2011-03-041-1/+1
| | | | | | | |
| | | * | | | | Support to build Qt for Symbian on Mac OS X with gcce compiler.axis2011-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: axis RevBy: Morten Johan Sørvig Conflicts: configure
| | | * | | | | Changed various qmake constructs to support Windows.axis2011-02-181-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Thomas Zander Conflicts: mkspecs/features/symbian/symbian_building.prf
| | | * | | | | Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander Conflicts: src/s60main/s60main.pro
| * | | | | | | QS60Style slows down layout switch by updating widgets unnecessarilySami Merila2011-03-143-22/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove refreshUi() method frmo QS60Style. It might have been necessary two years ago, when we didn't have proper polishing of QWidgets (when style changed), but it is no longer needed. It just slows down orientation switch. Task-number: QTBUG-17840 Reviewed-by: Tomi Vihria
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-154-7/+72
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Border still drawn on Rectangle elements when border.width == 0 Regression: currentIndex was not set correctly after model cleared. Remove bindings before assigning constants in VME
| * | | | | | Border still drawn on Rectangle elements when border.width == 0Martin Jones2011-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The _valid flag did not consider both color alpha and line width in both setters. Change-Id: Iba544d65a0a40e36f1e09091e007418c9eefa0cd Task-number: QTBUG-18102 Reviewed-by: Alan Alpert
| * | | | | | Regression: currentIndex was not set correctly after model cleared.Martin Jones2011-03-152-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change b3080d78f2ff2d98410249e09d5d7d6e20fd155c stopped the currentIndex from being updated when a new item is added to an empty view. Change-Id: I77a0789fcf3693034a2d7aca173fec669b913b18 Task-number: QTBUG-18123 Reviewed-by: Bea Lam
| * | | | | | Remove bindings before assigning constants in VMEAaron Kennedy2011-03-151-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c246cbcf8d0168cb4af028d6d04088fe20cdbba Task-number: QTBUG-17276
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-141-4/+4
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevented infinite recursion in QPainterPath::contains().
| * | | | | | Prevented infinite recursion in QPainterPath::contains().Samuel Rødal2011-03-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit the amount of recursions in qt_painterpath_isect_curve to prevent a crash. Task-number: QTBUG-16422 Reviewed-by: Kim
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-142-3/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: error() in case connection is closed unexpectedly SSL: Fix certification loading on Mac OS X 10.5
| * | | | | | | QNAM HTTP: error() in case connection is closed unexpectedlyMarkus Goetz2011-03-141-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4658 Task-number: QT-3494 Reviewed-by: Peter Hartmann
| * | | | | | | SSL: Fix certification loading on Mac OS X 10.5Martin Petersson2011-03-141-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not add the expired certificates on Mac OS X 10.5. Task-number: QTBUG-14520 Reviewed-by: Markus Goetz
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-141-2/+5
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QTreeView::indexRowSizeHint returns incorrect value
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-149-14/+61
| |\ \ \ \ \ \ \
generated by cgit v0.12 at 2025-01-31 00:48:10 (GMT)