summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Implement language fallback logic for localize_deploymentMiikka Heikkinen2011-03-092-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When querying system locale it does return both language and country, so sometimes users want to have both in their .ts file names (e.g. myapp_zh_CN.ts). This is bit problematic in Symbian, where there are separate language codes for only very few language + country combinations. Until now, the unsupported combinations were simply dropped from deployment localization. More proper way to handle these unknown language + country combinations is to fall back to using the plain language code for them instead of dropping them altogether. This is somewhat analogous to how QTranslator::load() loads .ts files if it can't find the file for specified language + country combination. E.g. User defines: TRANSLATIONS += myapp_zh_CN.ts myapp_zh_HK.ts myapp_zh_TW.ts There are separate Symbian language codes for HongKong Chinese (zh_HK = 30) and Taiwanese Chinese (zh_TW = 29), but rest of the world is expected to use just Chinese (zh = 31). This means "zh_CN" mapping is not provided as it would be same as plain "zh". With this fix, qmake will now automatically generate a fallback mapping from "zh_CN" to "31" for deployment localization purposes, and is able to read application captions and pkg names from myapp_zh_CN.ts. If there are multiple TRANSLATIONS defined that would result in same Symbian language code, only the first one is used. Task-number: QTBUG-17927 Reviewed-by: Oswald Buddenhagen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-0920-30/+225
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-097-7/+136
| |\ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix unstable qdeclarativeflickable test. Update TextEdit's visible selection when only the anchor changes. Set correct initial value for TextEdit and TextInput canPaste property
| | * Fix unstable qdeclarativeflickable test.Martin Jones2011-03-081-2/+2
| | | | | | | | | | | | Change-Id: I81b02147f88e948e3f3a663de0390893f8349fd9
| | * Update TextEdit's visible selection when only the anchor changes.Andrew den Exter2011-03-083-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the limits of a TextEdit's text a key press can change/reset the anchor position without changing the cursor position. Checking the cursor position alone isn't enough to determine the selection hasn't changed. Change-Id: Ic425ac0c06897d77e9c86b907ff10b39d78dd7a1 Task-number: QTBUG-17982 Reviewed-by: Martin Jones
| | * Set correct initial value for TextEdit and TextInput canPaste propertyYann Bodson2011-03-074-0/+78
| | | | | | | | | | | | | | | | | | Change-Id: Ied5b257305fa68db64fcf270ad2a42f691fbdca2 Task-number: QTBUG-17765 Reviewed-by: Martin Jones
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-081-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed memory leak in GL texture cache with QRuntimePixmapData.
| | * | Fixed memory leak in GL texture cache with QRuntimePixmapData.Samuel Rødal2011-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cached texture is associated with the QRuntimePixmapData, not to the proxied QPixmapData. Task-number: QT-4655 Reviewed-by: Gunnar Sletta
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-083-19/+38
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix possible bearer management Crash with Panic E32USER-CBase, 69 QNetworkCookie: fix quoted values Fix for QTBUG-17746. Quotes is retained in cookie value Unsuccessful unlocking of QNetworkConfigurationPrivate mutex
| | * | | Fix possible bearer management Crash with Panic E32USER-CBase, 69Cristiano di Flora2011-03-081-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Task-Number: QT-4652 Reviewed-by: Xizhi Zhu
| | * | | QNetworkCookie: fix quoted valuesPeter Hartmann2011-03-072-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not strip quotes etc. from cookie values; from the RFC 2109: "The VALUE is opaque to the user agent (...)". In addition, escaped quotes are allowed in quoted values. Reviewed-by: Markus Goetz Task-number: QTBUG-17746
| | * | | Fix for QTBUG-17746. Quotes is retained in cookie valueAparna Nandyal2011-03-071-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1118 Task-number: QTBUG-17746 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| | * | | Unsuccessful unlocking of QNetworkConfigurationPrivate mutexPerttu Pohjonen2011-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Above mentioned mutex is locked twice: first in caller function and second time in called function. Called function unlocks mutex and emits signal clearly unaware that the mutex is actually still locked. I changed the mutex to be unlocked before the function is called. Task-number: QTBUG-15108 Reviewed-by: Ville Pernu
| * | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-03-082-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed unescaped backslashes in testcase.prf Fix `make check' for debug-and-release on Windows. Move `check' target for autotests into testcase.prf Revert "Backporting TESTARGS feature from 4.7" Backporting TESTARGS feature from 4.7 Update copyright year to 2011. embed copyright information in QtAssistantClient4.dll
| | * \ \ \ Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2011-03-082-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qttest_p4.prf src/script/utils/qscriptdate.cpp src/script/utils/qscriptdate_p.h tests/auto/qscriptvalue/testgen/testgenerator.cpp tests/auto/qscriptvalue/tst_qscriptvalue_generated.cpp
| | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2011-01-172-36/+66
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed unescaped backslashes in testcase.prf Fix `make check' for debug-and-release on Windows. Move `check' target for autotests into testcase.prf Revert "Backporting TESTARGS feature from 4.7"
| | | | * | | | Fixed unescaped backslashes in testcase.prfRohan McGovern2011-01-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit c5beba29f1ac44ce225d73da67503f23f8aeffdc)
| | | | * | | | Fix `make check' for debug-and-release on Windows.Rohan McGovern2011-01-171-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 012a777ecec0ca74cf95683f069cb79774b7093a)
| | | | * | | | Move `check' target for autotests into testcase.prfRohan McGovern2011-01-172-35/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testcase.prf is installed, thus allowing `make check' to work outside of the Qt source tree. (cherry picked from commit d29e1dda8fbc24087b9cf0bf08d929bef74f5c96)
| | | | * | | | Revert "Backporting TESTARGS feature from 4.7"João Abecasis2011-01-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0336bc0cc8b4c0b0e75315594c1db83ee9b30f2e.
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2011-01-121-0/+1
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Backporting TESTARGS feature from 4.7
| | | | * | | | Backporting TESTARGS feature from 4.7João Abecasis2011-01-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally introduced in d29e1dda8fbc24087b9cf0bf08d929bef74f5c96. This patch should be reverted when it reaches the 4.7 branch again. Reviewed-by: Sergio Ahumada
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2011-01-128990-9063/+9063
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update copyright year to 2011.
| | | | * | | | Update copyright year to 2011.Jason McDonald2011-01-108990-9063/+9063
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2010-12-201-0/+2
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: embed copyright information in QtAssistantClient4.dll
| | | | * | | | embed copyright information in QtAssistantClient4.dllJoerg Bornemann2010-12-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4054 Reviewed-by: Christian Kandeler
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-077-1/+48
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Invalidate the EGL surface of QMeeGoLivePixmapData when switching to Raster
| | * | | | | | Invalidate the EGL surface of QMeeGoLivePixmapData when switching to RasterPauli Nieminen2011-03-077-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMeeGoLivePixmap fails to lock the EGL surface and texture after switch to raster graphics system. The EGL surface is invalid after eglTerminate call in switch. But QMeeGoLivePixmapData doesn't know about the switch. Marking EGL surfaces and texture invalid after switch makes live pixmap automatically recreate the surface when next time requiring live pixmap. Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> Merge-request: 2571 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | | | | | Added missing ifdefs to allow compilation on older Symbian versions.Laszlo Agocs2011-03-092-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
* | | | | | | | Multiple screen support for Symbian in QDeskopWidget.Laszlo Agocs2011-03-098-44/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using TV-out, the TV display can be used as an independent screen. By default the content shown there is a clone of the device screen, however from now on parenting a widget to QDesktopWidget::screen(1) and calling show() will turn off cloning and have the widget shown instead. screenCount() and the screenCountChanged signal can be used to detect the availability of the secondary display, just like on other platforms. Task-number: QT-830 Reviewed-by: Sami Merila Reviewed-by: Jani Hautakangas
* | | | | | | | Adding quote around files in QMAKE_CLEAN to tackle wildcard issueGuoqing Zhang2011-03-092-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTPROD-875 Reviewed-by: Miikka Heikkinen
* | | | | | | | Added native image handle provider header.Laszlo Agocs2011-03-082-1/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4632 Reviewed-by: Jani Hautakangas
* | | | | | | | Added native image handle provider support in pixmaps on openvg.Laszlo Agocs2011-03-0810-6/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNativeImageHandleProvider is a thin interface consisting of get() and release() functions. Pixmaps constructed with such a provider will call these functions to acquire and release a native handle, e.g. a CFbsBitmap or RSgImage pointer in case of Symbian. The behavior is largely similar to constructing pixmaps via fromSymbianCFbsBitmap or fromSymbianRSgImage, with the exception of pixmap hibernation: release() (and subsequently get()) is guaranteed to be called also in case of hibernation, allowing more fine-grained tracking of the usage and lifetime of image data. Task-number: QT-4632 Reviewed-by: Jani Hautakangas
* | | | | | | | Correcting incorrect ordinal introduced by the split view changes.Laszlo Agocs2011-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
* | | | | | | | Support partial input modeSami Merila2011-03-086-9/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default Symbian devices use fullscreen editing mode. However, in the latest AVKON releases a partial virtual keyboard is supported. Support the non-fullscreen editing mode from QCoeFepInputContext. The non-fullscreen editing mode is only supported for Symbian^3 and only for graphicsview-based solutions (QGraphicsView, QGraphicsWebView, QDeclarativeView, ...). When native side indicates that the keyboard opens, the graphicsview is possibly translated so that the text cursor position is ensured to be visible. When keyboard closes, the translation is removed. If the graphicsview contains vertical scrollbar, the whole view is resized to the area above the keyboard, since translating it, would move the upper part of the scrollbar out of screen area. There is a new exported private API to control when partial vkb is used. Task-number: QTBUG-16572 Reviewed-by: axis Reviewed-by: Mrudul Pendharkar Reviewed-by: Laszlo Agocs
* | | | | | | | Avoid compiler warnings in openvg on win32.Laszlo Agocs2011-03-072-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
* | | | | | | | Updated def files with new QVGPixmapData function.Laszlo Agocs2011-03-072-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
* | | | | | | | VGImage readback support in QPixmap on OpenVG.Laszlo Agocs2011-03-075-12/+148
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable readback of pixel data for pixmaps that are constructed directly from a VGImage. These do not have any backing data in main memory (i.e. 'source' is null), however certain operations, like toImage(), fill(), or painting into the pixmap do not work without it. With this patch the data is read back via vgGetImageSubData when needed. Task-number: QT-4669 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-071-2/+9
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: PinchArea example produced incorrect scaling.
| * | | | | | PinchArea example produced incorrect scaling.Martin Jones2011-03-071-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maths was dodgy - producing far greater scaling than that provided by PinchArea. Change-Id: I4a1ee1b0d65eed623ec9ee92c22c9740116430c5 Task-number: QTBUG-17828 Reviewed-by: Michael Brasser
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-044-2/+10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added image conversion flag to prevent conversions.
| * | | | | | Added image conversion flag to prevent conversions.Samuel Rødal2011-03-044-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed in the meego graphics system to support the shared image fallback path (when using the raster graphicssystem). The flag is internal. Reviewed-by: Gunnar Sletta
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-046-23/+151
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix TextInput auto test failure on mac. Fix word selection locking on string boundaries. Fix potential crash in QTextControl. QDeclarativePropertyMap::keys() cannot be called from qml Compensate for horizontal scroll in TextInput micro focus.
| * | | | | | Fix TextInput auto test failure on mac.Andrew den Exter2011-03-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable auto scroll so the relative position of the text isn't changed when inserting text and changing the cursor position. Change-Id: I6a18e91e98014f1e94216bc85241ebb0d604dd84 Reviewed-by: Bea Lam
| * | | | | | Fix word selection locking on string boundaries.Andrew den Exter2011-03-042-12/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextBoundaryFinder will return the position -1 if it reaches the end of a string without finding a boundary, reset the cursor and anchor to 0 or the string length as appropriate in those cases. Also allow selection to lock onto the string limits as if they were words. Change-Id: Ie9d233967c73eb6a61f19c76494f04bca18612f8 Task-number: QTBUG-17860 Reviewed-by: Martin Jones
| * | | | | | Fix potential crash in QTextControl.Lasse Holmstedt2011-03-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inputContext() is only safe to call if there is a current contextWidget. Change-Id: I6cbccf5f5fbb2d8c9ca6acf5f7e02f680eb84483 Reviewed-by: Andrew den Exter
| * | | | | | QDeclarativePropertyMap::keys() cannot be called from qmlCharles Yin2011-03-033-8/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not allow create dynamic properties which are same with existing method (method, signal, slot) names. Change-Id: I0ae64c8a6a89ef4f7614169088f7c005edad40b0 Task-number:QTBUG-17868 Reviewed-by:Martin Jones
| * | | | | | Compensate for horizontal scroll in TextInput micro focus.Andrew den Exter2011-03-032-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return the adjusted cursore rectangle rather than the one returned by QLineControl. Change-Id: I343ecdb47ef2ea59519c8d155bbb9917d9c8ce56 Task-number: QTBUG-17864 Reviewed-by: Martin Jones
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-031-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use the generic QVoltileImage implementation on S60 3.1 and 3.2.
| * | | | | | | Use the generic QVoltileImage implementation on S60 3.1 and 3.2.Laszlo Agocs2011-03-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BeginDataAccess() and EndDataAccess() is only available from S60 5.0 and QVolatileImage is not used on such platforms anyway. Reviewed-by: Jani Hautakangas
generated by cgit v0.12 at 2025-09-07 18:29:52 (GMT)