summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-199-100/+259
| | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-02-1917-549/+204
|\
| * Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-199-259/+100
| | | | | | | | | | | | This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7. It breaks non-Symbian platforms.
| * Revert "Factored epocRoot implementation out of qmake"axis2010-02-1913-292/+106
| | | | | | | | | | | | This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64. It breaks non-Symbian platforms.
* | Virtual keyboard can't be closed anymore after tapping the text areaSami Merila2010-02-191-1/+4
|/ | | | | | | | | | | | | | On Symbian^3, the virtual keyboard cannot be closed anymore when the editor area where the text is displayed is tapped and autocompletion is suggesting a word currently. This is caused by the fragile native FEP manager which assumes that client must report certain event (EAknCursorPositionChanged), after user interaction with the editor area. Otherwise the native FEP manager is in dead-lock, until somebody reports this event to it. Task-number: QTBUG-7828 Reviewed-by: axis
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-1941-344/+3363
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pass QAudioDeviceInfo when creating audio input/output in examples Symbian backend for QtMultimedia audio Modified configure to detect SDK support for Symbian audio backend Added implementation of epocRoot() function to configure Removed duplicated implementation of readRegistryKeys from configure Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake QWebView scrolling doesn't clear old elements before painting again
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-1941-344/+3363
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pass QAudioDeviceInfo when creating audio input/output in examples Symbian backend for QtMultimedia audio Modified configure to detect SDK support for Symbian audio backend Added implementation of epocRoot() function to configure Removed duplicated implementation of readRegistryKeys from configure Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake QWebView scrolling doesn't clear old elements before painting again
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-1841-344/+3363
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pass QAudioDeviceInfo when creating audio input/output in examples Symbian backend for QtMultimedia audio Modified configure to detect SDK support for Symbian audio backend Added implementation of epocRoot() function to configure Removed duplicated implementation of readRegistryKeys from configure Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake QWebView scrolling doesn't clear old elements before painting again
| | | * Pass QAudioDeviceInfo when creating audio input/output in examplesGareth Stockwell2010-02-182-2/+3
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Symbian backend for QtMultimedia audioGareth Stockwell2010-02-1814-1/+2720
| | | | | | | | | | | | | | | | Task-number: QT-567
| | | * Modified configure to detect SDK support for Symbian audio backendGareth Stockwell2010-02-182-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | This version of configure.exe was compiled with MSVC 9.0. Reviewed-by: Miikka Heikkinen
| | | * Added implementation of epocRoot() function to configureGareth Stockwell2010-02-184-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposing epocRoot() to the configure application allows it to determine the location of the currently active Symbian SDK, so that support for optional SDK features can be checked. Reviewed-by: Miikka Heikkinen
| | | * Removed duplicated implementation of readRegistryKeys from configureGareth Stockwell2010-02-183-125/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure now shares - at the source level - a single implementation of this function with qmake. Reviewed-by: Miikka Heikkinen
| | | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-1813-106/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen
| | | * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-189-100/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-02-181-1/+1
| | | |\
| | | * | QWebView scrolling doesn't clear old elements before painting againSami Merila2010-02-182-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Petri <petri.ojala@digia.com> Date: Wed Feb 10 12:27:19 2010 +0200 Patch to QTBUG-7286 QWebView scrolling doesn't clear old elements before painting on top of them. The bug exists only if web page does not set its backgroung color. Solution is to set White color as a default color for web page backgrounds. White color was causing some visibility problem (at least with lineedit) and it was solved by editing ::canDrawThemeBackground Task-number: QTBUG-7286 Reviewed-by: Sami Merila
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1913-84/+170
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Moving QDir benchmarks; making way for new test cases Fixing QDir benchmarks... QTreeView: Fix premature pessimization Simplify code, fix a compiler warning... profit! tst_qnetworkreply: Add another testcase QNAM HTTP: Clean code a bit QNAM HTTP: Always set channel.reply to 0 when done Revert "Added note to make QList destructor virtual in version 5" Fix s390(x) atomic ops related crashes Fix undefined sequence point compiler warning
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1813-84/+170
| |\ \ \ \ |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Moving QDir benchmarks; making way for new test cases Fixing QDir benchmarks... QTreeView: Fix premature pessimization Simplify code, fix a compiler warning... profit! tst_qnetworkreply: Add another testcase QNAM HTTP: Clean code a bit QNAM HTTP: Always set channel.reply to 0 when done Revert "Added note to make QList destructor virtual in version 5" Fix s390(x) atomic ops related crashes Fix undefined sequence point compiler warning
| * | | | Moving QDir benchmarks; making way for new test casesJoão Abecasis2010-02-183-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Also, removed dependency on QtGui; gave test case a more meaningful name; using bench_ prefix, instead of tst_ for benchmarks.
| * | | | Fixing QDir benchmarks...João Abecasis2010-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial state of QDirIterator is ill-defined. If the hasNext returns true, then one must start by advancing the iterator to the first position. (Rinse, lather, repeat)
| * | | | QTreeView: Fix premature pessimizationJoão Abecasis2010-02-181-4/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| * | | | Simplify code, fix a compiler warning... profit!João Abecasis2010-02-181-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Well, it was a compiler warning on master... :-/ Reviewed-by: Janne Anttila Reviewed-by: axis
| * | | | tst_qnetworkreply: Add another testcaseMarkus Goetz2010-02-181-0/+66
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | | | QNAM HTTP: Clean code a bitMarkus Goetz2010-02-182-29/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. and some changes that will help us track down bugs Reviewed-by: Peter Hartmann
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-188-34/+35
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Always set channel.reply to 0 when done Revert "Added note to make QList destructor virtual in version 5" Fix s390(x) atomic ops related crashes Fix undefined sequence point compiler warning
| | * | | | QNAM HTTP: Always set channel.reply to 0 when doneMarkus Goetz2010-02-185-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help us to track down a sporadic bug that made requests being sent again even if they were already done. Reviewed-by: Peter Hartmann
| | * | | | Revert "Added note to make QList destructor virtual in version 5"Zeno Albisser2010-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Virtual functions should not be used with copyable types due to slicing. This reverts commit c1db6c2c5a3bbe96a628207af169a032d535426f.
| | * | | | Fix s390(x) atomic ops related crashesDirk Mueller2010-02-171-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The s390 implementation of the pointer related atomic ops never worked before, and the memory barrier was mixed up between the Acquire and the Relaxed variant. This fixes both. Merge-request: 2312 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | | Fix undefined sequence point compiler warningDirk Mueller2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | level = ++level is not guaranteed to work, as the increment is not required to happen before the assignment. Change this code to be less obscure and use standard defined behavior. Merge-request: 471 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1811-176/+151
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Help system: Remove hard-coded qt namespace. Help system: Handle all Clucene exceptions.
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1811-176/+151
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Help system: Remove hard-coded qt namespace. Help system: Handle all Clucene exceptions.
| | * | | | Help system: Remove hard-coded qt namespace.ck2010-02-1811-58/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7821 Reviewed-by: kh1
| | * | | | Help system: Handle all Clucene exceptions.ck2010-02-181-118/+112
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-188-188/+175
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Always use display() in QEglContext, so initialization can occur Fixed a regression in dockwidgets that would jump when toplevel resized Stabilize QGraphicsView benchmarks. Remove platform dependent code from QGraphicsView benchmark. Compiler warnings in QGraphicsView benchmark. Stabilize QGraphicsScene benchmarks. Compiler warning, unusable variable in tst_QGraphicsScene benchmark. Documented behavior of blur effect radius and drop shadow offset. Fixed autotest failure in tst_QPainter::drawEllipse on Maemo.
| * | | | | Always use display() in QEglContext, so initialization can occurTom Cooksey2010-02-181-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trustme
| * | | | | Fixed a regression in dockwidgets that would jump when toplevel resizedThierry Bastian2010-02-182-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was reproducible when the main window doesn't contain a central widget. Task-number: QTBUG-8107 Reviewed-by: ogoffart
| * | | | | Stabilize QGraphicsView benchmarks.Bjørn Erik Nilsen2010-02-181-125/+134
| | | | | |
| * | | | | Remove platform dependent code from QGraphicsView benchmark.Bjørn Erik Nilsen2010-02-181-33/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, it doesn't make much sense to have platform specific code like this in a benchmark. Second, the Q_OS_SYMBIAN specific values makes more sense anyways, so we can use them on all platforms.
| * | | | | Compiler warnings in QGraphicsView benchmark.Bjørn Erik Nilsen2010-02-181-3/+4
| | | | | |
| * | | | | Stabilize QGraphicsScene benchmarks.Bjørn Erik Nilsen2010-02-181-1/+13
| | | | | |
| * | | | | Compiler warning, unusable variable in tst_QGraphicsScene benchmark.Bjørn Erik Nilsen2010-02-181-1/+0
| | | | | |
| * | | | | Documented behavior of blur effect radius and drop shadow offset.Samuel Rødal2010-02-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our graphics effects are always done in device coordinates (unless they can be done in logical coordinates with the same result as an optimization, e.g. opacity effects). Reviewed-by: Andy Shaw
| * | | | | Fixed autotest failure in tst_QPainter::drawEllipse on Maemo.Samuel Rødal2010-02-182-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fix (baa7c3bdecc) attempted to fall back to path drawing in QPainter::drawEllipse, however we have some specific filling rules for aliased ellipse drawing in the raster paint engine. We should use the (now free of fixed point math) drawEllipse_midpoint_i function on all platforms. Reviewed-by: Gunnar Sletta
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-188-15/+44
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use correct include path for qglobal.h Fixed softkey localizaton to comile also on platforms without softkeys. Use correct (forward slash) separators in qmake-generated bld.inf Support for dynamic localization in Symbian softkeys.
| * | | | Use correct include path for qglobal.hIain2010-02-181-1/+1
| | |_|/ | |/| | | | | | | | | | Reviewed-by: Shane Kearns
| * | | Fixed softkey localizaton to comile also on platforms without softkeys.Janne Anttila2010-02-181-0/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6785 Reviewed-by: TrustMe
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-187-14/+41
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use correct (forward slash) separators in qmake-generated bld.inf Support for dynamic localization in Symbian softkeys.
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-177-14/+41
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use correct (forward slash) separators in qmake-generated bld.inf Support for dynamic localization in Symbian softkeys.
| | * | Use correct (forward slash) separators in qmake-generated bld.infIain2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should always use forward slash as a directory separator in include paths - it's not OS dependant. Task-number: QTBUG-8308 Reviewed-by: Alessandro Portale