summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-172-3/+10
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix delayed password masking mid-string.
| * Fix delayed password masking mid-string.Andrew den Exter2011-08-172-3/+10
| | | | | | | | | | | | | | | | Unmask the last character typed, not the last character in the string. Change-Id: I9c70d2347bf878c18ab0a7f4ea76f755ca19a85c Task-number: QTBUG-17003 Reviewed-by: Alan Alpert
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-161-4/+5
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: don't crash when destroying codec list
| * | don't crash when destroying codec listOswald Buddenhagen2011-08-151-4/+5
| | | | | | | | | | | | this was uncovered by rittk's don't-detach patch.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-161-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Disabled splitscreen translation still moves screen
| * | | Disabled splitscreen translation still moves screenSami Merila2011-08-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not connect (or disconnect) signal cursorPositionChanged() to slot translateInputWidget() if auto-translation of splitview is disabled. Task-number: QTBUG-20813 Reviewed-by: Miikka Heikkinen
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-152-0/+19
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Join user state of removed text blocks
| * | | Join user state of removed text blocksLeandro Melo2011-08-152-0/+19
| | | | | | | | | | | | | | | | Done-with: mae
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-121-0/+9800
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Adding Persian translation of Qt.
| * | | Adding Persian translation of Qt.Soroush Rabiei2011-08-121-0/+9800
| | | | | | | | | | | | | | | | | | | | Merge-request: 2640 Reviewed-by: ossi
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-121-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Missed break of switch-case added
| * | | Missed break of switch-case addedViktor Kolesnyk2011-08-121-0/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 2642 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-122-3/+24
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix softkeys cleanup Fix clientRect usage in QWidgetPrivate::setGeometry_sys() Do not allow fullscreen/maximized windows to expand beyond client rect Do not modify window size for fullscreen windows in setGeometry_sys
| * | | Fix softkeys cleanupMiikka Heikkinen2011-08-121-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSoftKeyManager's keyedActions and softKeyCommandActions hashes were not properly cleaned up, resulting in randomly incorrect softkeys as already deleted cached actions were assigned to softkeys if the new action happened to be in the same address as the previously deleted action. Two bugs related to this were fixed: 1) qobject_cast can't be used in "destroyed" signal handler, as the cast will return NULL pointer in this case. Changed the cast to static_cast, which is safe here as the pointer is only used as a hash key. 2) If softkey action was created with QSoftKeyManager::createAction instead of QSoftKeyManager::createKeyedAction, the "destroyed" signal was not connected to cleanupHash slot, leaving such actions in softKeyCommandActions hash after deletion. Ensured the signal was connected properly in both cases. Task-number: QTTH-1442, QTBUG-20214 Reviewed-by: Gareth Stockwell
| * | | Fix clientRect usage in QWidgetPrivate::setGeometry_sys()Miikka Heikkinen2011-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S60->clientRect() should be used these days for getting S60 client rect, so fix the old fashined usage that was in cherry-picked commit. Task-number: QTTH-1306 Reviewed-by: TrustMe
| * | | Do not allow fullscreen/maximized windows to expand beyond client rectMiikka Heikkinen2011-08-111-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic layouting of widgets still managed to layout maximized and fullscreen windows larger than client rect in Symbian in some cases. Fixed by limiting window dimensions to client area boundaries in setGeometry_sys if the window is maximized or fullscreen. Task-number: QTBUG-5697 Reviewed-by: Sami Merila
| * | | Do not modify window size for fullscreen windows in setGeometry_sysMiikka Heikkinen2011-08-111-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimum sizes of widgets can cause windows to expand beyond screen limits in QWidgetPrivate::setGeometry_sys. Normally this is not noticeable as the window size is forced in various places to the clientRect, but there are certain sequences where the size set in setGeometry_sys is the final one, resulting in too large windows. Removed the modification of window size in setGeometry_sys for fullscreen windows for which the correct size is already requested. Task-number: QTBUG-18749 Reviewed-by: Sami Merila
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-110-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Revert accidental commit Rework threading internals in XmlListModel to avoid global static
| * | | Revert accidental commitBea Lam2011-08-111-205/+91
| | | | | | | | | | | | | | | | | | | | | | | | Revert "Rework threading internals in XmlListModel to avoid global static" This reverts commit 7a80c5d656e5492dc026cbf643847d7f9c50324a.
| * | | Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-111-91/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-20629 reports a crash on destruction of XmlListModel when cleaning up the global static for the QDeclarativeXmlQuery object. The fix restructures the internals to be like the threading structure used for QDeclarativePixmapReader which doesn't use a global static. Task-number: QTBUG-20629 Change-Id: I036cc673fa603ad4b5661f3facc811cc83710a89
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-082-2/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix undesirable VKB popup at task switch
| * | Fix undesirable VKB popup at task switchMiikka Heikkinen2011-08-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | showInputPanelOnFocus = false needs to be set in declarative edit controls also on S60 platforms beyond Symbian^3, or VKB will popup when application itself comes to foreground if focus is on an edit control. With this fix the functionality is identical to S60 native apps. Task-number: QTBUG-20218 Reviewed-by: Joona Petrell
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-059-13/+37
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix compile errors on S60 3.2 Fix to QGLWidget rendering with VG graphics system
| * | Fix compile errors on S60 3.2Shane Kearns2011-08-057-12/+16
| | | | | | | | | | | | | | | Task-number: QTBUG-20743 Reviewed-by: Liang Qi
| * | Fix to QGLWidget rendering with VG graphics systemJani Hautakangas2011-08-052-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QEGLContext don't expect EGL based API to change on runtime (e.g. VG->GL). QEGLContext caches current API context pointer and uses this cached value to determine whether to make eglMakeCurrent call or not. VG graphics system and QGLWidget creates own separate QEGLContext objects, but both of those objects consider themself to be current context, so no eglMakeCurrent call occurs even though the API has changed. This patch adds ifdef'd current context check for Symbian which enables eglMakeCurrent call if EGL API has changed. (Symbian is the only supported platform currently where this scenario happens). Task-number: QT-5012 Reviewed-by: Samuel Rødal
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-041-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbian/gcce: Remove the useless -T flag
| * | Symbian/gcce: Remove the useless -T flagMartin Storsjo2011-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The -T flag is a linker flag, not a compiler flag, and does nothing. If specified as a linker flag, this even yields errors (since there is no linker script file named 'script'). Merge-request: 1302 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-042-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix installation on S60 5.0 Fix fancybrowser.pro
| * | Fix installation on S60 5.0Shane Kearns2011-08-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | A case change broke the case sensitive comparison of UIDs to check if the package being built was Qt itself - this caused a recursive dependency in the sis file. Task-number: QTBUG-20742 Reviewed-by: Miikka Heikkinen
| * | Fix fancybrowser.proShane Kearns2011-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Somehow, the latin-1 multiply symbol was used instead of an 'x' in hex literals. Task-number: QTBUG-15716 Reviewed-by: mread
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-042-4/+25
|\ \ \ | | |/ | |/| | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move cursorDelegate with the mouse selection of read only text input.
| * | Move cursorDelegate with the mouse selection of read only text input.Andrew den Exter2011-08-042-4/+25
| | | | | | | | | | | | | | | | | | Change-Id: Iae4b2f9f6c9a7da7ec0e194b2568fb3a6da8ea71 Task-number: QTBUG-19109 Reviewed-by: Martin Jones
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-08-03127-52415/+26133
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Updating libpng: Patches to libpng 1.5.4 for building it in Qt Updating libpng: Add libpng version 1.5.4 Updating libpng: Remove version 1.4.0
| * | | Updating libpng: Patches to libpng 1.5.4 for building it in Qtaavit2011-08-022-5/+18
| | | |
| * | | Updating libpng: Add libpng version 1.5.4aavit2011-08-0241-0/+59715
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a clean copy of the official libpng 1.5.4 distribution, except that various extraneous stuff (examples, tests, etc) have been removed, as usual. The minor modifications to build it in Qt will follow in a separate commit.
| * | | Updating libpng: Remove version 1.4.0aavit2011-08-02124-86010/+0
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-031-1/+6
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Ignore child elements in non-application caption/pkg name translations
| * | | Ignore child elements in non-application caption/pkg name translationsMiikka Heikkinen2011-08-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian, when parsing .ts files for deployment localization, qmake would break if there was any translation using lengthvariants inside QtApplicationCaptions context. Technically this is legal though QtApplicationCaptions context is only meant for application captions and we don't support lenghtvariants for the actual captions themselves. Changed parsing so that any child elements on translations are simply skipped instead of causing parsing errors. Task-number: QT-5169 Reviewed-by: Guoqing Zhang
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-021-107/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove DerivedSources.pro from WebKit.
| * | | | Remove DerivedSources.pro from WebKit.Jocelyn Turcotte2011-08-021-107/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This .pro file gets processed by qmake while looking recursively for pro files. This may cause warnings and the file isn't necessary since derived sources have to be pre-generated before importing WebKit into src/3rdparty. Reviewed-by: Benjamin Poulain
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-022-0/+7
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support debuggable in the makefile build system Mark all Symbian debug binaries debuggable by default
| * | | | Support debuggable in the makefile build systemLiang Qi2011-08-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20697 Reviewed-by: Shane Kearns Reviewed-by: Miikka Heikkinen
| * | | | Mark all Symbian debug binaries debuggable by defaultMiikka Heikkinen2011-08-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CODA 4.1.* cannot be used to debug binaries that do not have DEBUGGABLE_UDEBONLY keyword specified, so add this keyword to all projects by default. Adding this keyword has no impact for previous versions of CODA or TRK. Task-number: QTBUG-20669 Reviewed-by: Shane Kearns
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-021-21/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Detect linked fonts by name (insead of via CLinkedTypeface* Api)
| * | | | Detect linked fonts by name (insead of via CLinkedTypeface* Api)Alessandro Portale2011-08-021-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The detection of Linked Fonts via CLinkedTypeface* Api does not work in all cases. It works in QML apps, but not in QWidgets based apps. The reason is still unclear. This commit replaces the CLinkedTypeface* Api based code of commit fa344b355d311fce7954e2fd1a22a87a88194783 whith a simple type face anme analysis. Assumption is that the names of Linked Fonts always end with "LF" and are all upper case. This patch has been tested by more people than just me, but it is too dirty to mention the others as reviewer. I take the shame and blame. Task-Number: QTBUG-20007
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-08-020-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
| * \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-1212-71/+144
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Remove broken link to Symbian.org documentation. Check engine existence before increasing reference count Keep reference count for cached font engines in QTextEngine Optimize text layout. Fix crash when app font is added Backporting fix for QTBUG-18716 Fixing WINSCW compile error
| * \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-0812-166/+294
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: sync win32-g++-cross with win32-g++ (lib prefix and extension) Flicking behaviour of ListView/GridView SnapOnItem is inconsistent Skip flick velocity test on Mac. Try again to fix flickable velocity on Mac. Try to fix Mac CI test failure Flickable is too sensitive. Reduce timing dependancy in flickable test Velocities reported by Flickable in onFlickStarted can be 0 Fix memory leak in QHostInfo Regression: Some QMenus are shown completely transparent in Symbian Update the Window title when closing the last tab. Fix bidi reordering when part of text is rendered by fallback font
| * \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-069-17/+49
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: On symbian QMessageBox does not look like native dialog HTTP internals: continue gzip decompression if buffer fills exactly HTTP internals: do not discard data if not receiving gzip end marker Support partial input mode - documentation update Add a null check for the backend in QNetworkReplyImpl. Support partial input mode
| * \ \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-0693-1707/+2377
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fixes switching runtime graphics system when the maximized window is shown or hidden. QS60Style: QMessageBox theme background is incorrect Adding "hkscs_2004" to the codec alias table Adding Kazakh entry to the codec alias table On symbian QMessageBox icon is on different side than in native dialog Fix horizontal center alignment with trailing space Regression: QS60Style - All standardIcons are drawn as "small icons" QS60Style: provide more standard icons Update QtOpenGL section in Symbian platform notes. Re-apply licenseheader text in source files for qt4.7 The qmlshadersplugin deployment must be scoped same as its building Do not try to open VKB if it is already open in Symbian Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine Fix QWidget::palettePropagation2() autotest on Symbian (part 2) Fix QWidget::palettePropagation2() autotest on Symbian QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5 Fix text color in some cases of QML and QStaticText Added qmlshadersplugin to Symbian s60installs.pro-file.