summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* L10n: Update German translations.Friedemann Kleint2011-03-292-3/+75
|
* Update changes for 4.7.3Timo Turunen2011-03-281-0/+12
| | | | Reviewed-by: Trust Me
* directfb: avoid version dependency by setting DSPD_DST blend functions manuallyDenis Oliver Kropp2011-03-281-3/+2
| | | | | Merge-request: 2558 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
* fix -enable-stdcall-fixup usageMark Brand2011-03-281-2/+2
| | | | | | | | | | the leading "-Wl," was apparently accidentally split off to the wrong line. Originally done in 0953ee3 for mkspecs/win32-g++. Merge-request: 1154 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Report that an update is needed if no update was doneThiago Macieira2011-03-281-1/+1
|
* QSslSocket: add test for blacklisted certificatesPeter Hartmann2011-03-253-3/+74
| | | | | Reviewed-by: Richard J. Moore Task-number: QTBUG-18338
* QSslSocket internals: abort on encountering blacklisted certificatesPeter Hartmann2011-03-251-0/+7
| | | | | | | | tested manually with "openssl s_server -cert blacklisted.pem -key key.pem" and connecting a QSslSocket. Reviewed-by: Markus Goetz Task-number: QTBUG-18338
* QSslCertificate: fix test for blacklisted certs on WindowsPeter Hartmann2011-03-251-2/+2
| | | | | | | | Apparently the wildcard matching and the SRCDIR hack don't go well together. Reviewed-by: Markus Goetz Task-number: QTBUG-18338
* QSslCertificate: report fraudulent certificates as invalidPeter Hartmann2011-03-2412-4/+213
| | | | | | | | | | There are some fraudulent certificates in the wild that are not valid; this patch introduces a blacklist of serial numbers of those certificates. Reviewed-by: Richard J. Moore Reviewed-by: Markus Goetz Task-number: QTBUG-18338
* FTP: Only read as much as the buffer size the user providedMarkus Goetz2011-03-241-2/+2
| | | | | Task-number: QTBUG-18309 Reviewed-by: Peter Hartmann
* Fixes QT-4753Xizhi Zhu2011-03-232-10/+13
| | | | | | Invalid read in ICD plugin for bearer management. Reviewed-by: Iiro Kause
* sort out stdout vs. stderr usageOswald Buddenhagen2011-03-222-34/+39
| | | | Task-number: QTBUG-14728
* Changes for 4.7.3Timo Turunen2011-03-221-0/+47
| | | | Reviewed-by: Trust Me
* Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-2178-513/+2392
|\ | | | | | | | | Conflicts: dist/changes-4.7.4
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-219-151/+174
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Change the pooled QGLPixmapData to be backed by QVolatileImage. Started changes-4.7.4 file Changed s60 style not to rely on QPixmapData::toNativeType(). Add missing bitmap locking to QVGPixmapData::fromNativeType. Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.
| | * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-s60-public into 4.7Laszlo Agocs2011-03-211-0/+31
| | |\
| | | * Started changes-4.7.4 fileEckhart Koppen2011-03-211-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | Placeholder file created to allow package creation Reviewed-by: TrustMe
| | * | Change the pooled QGLPixmapData to be backed by QVolatileImage.Laszlo Agocs2011-03-215-141/+128
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This change currently affects QGLPixmapData on Symbian only. Similarly to the OpenVG engine, using QVolatileImage allows more efficient handling of to- and fromSymbianCFbsBitmap, reduces local heap usage, and improves s60 style performance. Task-number: QTBUG-15252 Reviewed-by: Jani Hautakangas
| | * Changed s60 style not to rely on QPixmapData::toNativeType().Laszlo Agocs2011-03-212-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Forcing VG (and GL) pixmapdata to support toNativeType() with type VolatileImage is unnecessary. It is cleaner to try doing a fromNativeType() with bitmap+mask and fall back if that results in a null pixmapdata. Reviewed-by: Jani Hautakangas
| | * Add missing bitmap locking to QVGPixmapData::fromNativeType.Laszlo Agocs2011-03-211-2/+4
| | | | | | | | | | | | Reviewed-by: Jani Hautakangas
| | * Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.Laszlo Agocs2011-03-211-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to recent changes QPixmap::fromImage() can return RGB16 images for OpenVG pixmaps created from CFbsBitmap of display mode EColor64K. The qpixmap autotest assumed that the returned image is always 32 bpp which is not true anymore. Now it explicitly checks for 16 bpp and handles it properly. 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-213-9/+29
| |\ \ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix writing to an attached property from script.
| | * | Fix writing to an attached property from script.Michael Brasser2011-03-213-9/+29
| | | | | | | | | | | | | | | | | | | | Change-Id: I80c228092271d4d9c5694607da7a123d06739731 Reviewed-by: Aaron Kennedy
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-2127-225/+1535
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: fixes/improvements for new QML right-to-left docs Fix license headers in example code Write Qt Quick 1.1 right-to-left documentation and examples Doc fix - QtQuick 1.1 scheduling
| | * | fixes/improvements for new QML right-to-left docsBea Lam2011-03-2113-108/+152
| | | | | | | | | | | | | | | | Clarify some of the docs and fix some broken doc links.
| | * | Fix license headers in example codeBea Lam2011-03-211-1/+41
| | | | | | | | | | | | | | | | Change-Id: I510caf92c2e33df2bb44d87cc07fe78a0823ab5f
| | * | Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-1822-186/+1412
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11042 Reviewed-by: Martin Jones Change-Id: I6319992dec52a4d9252c2df39801ebe6a7dee75d
| | * | Doc fix - QtQuick 1.1 schedulingBea Lam2011-03-181-1/+1
| | | | | | | | | | | | | | | | Change-Id: If19934bf378e5fbc6cb1dce1df2164905e97f0ed
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-195-14/+34
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add flag for forcibly propagating backing store alpha to framebuffer Fixed unmatched quotes in s60installs.pro
| | * | Add flag for forcibly propagating backing store alpha to framebufferGareth Stockwell2011-03-184-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the following rules applies to the creation and blitting of the Symbian raster backing store: 1. Creation of backing store with an alpha channel: Backing store has an alpha channel only if !QWidget::isOpaque. 2. Pre-filling of backing store prior to paint loop: Backing store is filled with transparent pixels if !QWidget::isOpaque. 3. Blitting of backing store: CGraphicsContext::EDrawModeWriteAlpha is used (meaning that backing store alpha values are propagated into the frame buffer), if QWidget::isOpaque. In order for the direct camera viewfinder to be visible on DSA devices, alpha=0 must be written into the framebuffer in the region where the viewfinder will be displayed. This requires a backing store with an alpha channel (1), use of CGraphicsContext::EDrawModeWriteAlpha (3), but not pre-filling of the entire backing store (2). This patch adds a new enum value, QWExtra::BlitWriteAlpha, which can be used by camera backends to achieve the desired behaviour. Task-number: QTMOBILITY-1278 Reviewed-by: Jani Hautakangas
| | * | Fixed unmatched quotes in s60installs.proGareth Stockwell2011-03-181-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Miikka Heikkinen
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-186-7/+58
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added setSwitchPolicy to MeeGo graphicssystem helper API.
| | * | | Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-186-7/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets the application control whether or not automatic switching should be used, and also to completely disable switching if desired. Reviewed-by: Armin Berres
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-181-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add /q switch to QMAKE_DEL_FILE command in symbian
| | * | | Add /q switch to QMAKE_DEL_FILE command in symbianMiikka Heikkinen2011-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Builds will otherwise halt without giving reason if a wildcard is given in QMAKE_CLEAN in symbian-abld. Task-number: QTBUG-18207 Reviewed-by: axis
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-173-5/+76
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Changes to driver workarounds. Switch to raster also when last window is destroyed (on MeeGo). Clipboard/Windows: Fix a hang when sending to non-responsive clients.
| | * | | Changes to driver workarounds.Robin Burchell2011-03-171-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Force enable brokenFBOReadBack on non-Nokia v1.4 SGX drivers (as this is apparantly not fixed, except on the Nokia drivers) - Add debug when workarounds are enabled to ease debugging This fixes the following MeeGo bug: https://bugs.meego.com/show_bug.cgi?id=5616 Merge-request: 1144 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | Switch to raster also when last window is destroyed (on MeeGo).Samuel Rødal2011-03-171-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will save GPU resources for applications that are in the background for most of the time and only show a window now and then. Reviewed-by: Armin Berres
| | * | | Clipboard/Windows: Fix a hang when sending to non-responsive clients.Friedemann Kleint2011-03-171-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if clipboard viewer is responsive before sending the contents. This prevents Qt Creator from hanging when copying text while a debugging session with a crashed/stopped debuggee is in progress. Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com> Task-number: QTBUG-17465
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-173-21/+158
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix accidental population of the disk cache with partial content Fix disk cache interaction for range retrieval HTTP requests.
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-177-8/+109
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-173-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-174-5/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-174-3/+23
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * '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-173-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set Qt::WA_OpaquePaintEvent and Qt::WA_NoSystemBackground for QDeclarativeView on meego. Change-Id: I301d2381ae831485d205ff42b0c15b3fa7a73424 Task-number: QTBUG-17173 Reviewed-by: Michael Brasser
| | * | | | Re-enable lineHeight tests.Yann Bodson2011-03-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests were disabled by 24d8e96624af91ab01a20c10625858300f16099b Change-Id: I5bf3e11dfb3c975415c3039b39a39c22984d2900
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-03-165-19/+84
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Introduce QGraphicsItem::ItemStopsFocusHandling flag
| | * \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-03-165-19/+84
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: 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-16228-1244/+6696
| | | |\ \ \ \ \
generated by cgit v0.12 at 2025-01-20 21:25:49 (GMT)