summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* protect nil dictionary from release.Lorn Potter2010-09-031-38/+47
| | | | Task-number: QTBUG-13335
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-09-03130-1846/+4175
|\
| * Fix potential KERN-EXEC 0 on Symbian.Aaron McCarthy2010-09-021-5/+16
| | | | | | | | | | | | | | | | SymbianEngine::updateConfigurationsL cannot be called from a non-main thread as it uses Symbian resources not shared between threads. Task-number: QTBUG-13064
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-0231-1198/+1802
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Reduce memory consumption of QtScript/JSC on Symbian Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC Rewrite ucstrcmp in terms of ucstrncmp Reorganise qelapsedtimer_unix.cpp for better inlining performance. Update the cpuid code to be better Revert "Restore default if to system default on session close."
| | * Ukrainian translation updatedVictor Ostashevsky2010-09-026-690/+1256
| | | | | | | | | | | | | | | | | | | | | | | | | | | New strings which appeared after MR783 and MR2456 are translated. Also some stylistic fixes applied. xmlpatterns translation started. Merge-request: 801 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-0225-508/+546
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Reduce memory consumption of QtScript/JSC on Symbian Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC Rewrite ucstrcmp in terms of ucstrncmp Reorganise qelapsedtimer_unix.cpp for better inlining performance. Update the cpuid code to be better Revert "Restore default if to system default on session close."
| | | * Fix remote crash in delivering D-Bus calls with too few argumentsThiago Macieira2010-09-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Patch by Christoph Feck. Task-number: QTBUG-13348 Reviewed by me
| | | * Ensure that OpenGL contexts are attached to an NSView before first paintTor Arne Vestbø2010-09-023-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attaching an OpenGL context to an NSView too soon will result in an error "invalid drawable" printed on the console. We used to guard against this by checking the visible property of the NSWindow, but this turned out to be too late, as we had already recived an initial paint event by then as part of showing the window. The visual result was a single frame of gray painted before the user's paint event code took effect. We solve this by hooking into setInitialFirstResponder on the NSWindow, which is called as part of making the window visible for the first time. At this point it's safe to attach the GL context to the NSView, so we iterate all the GLWidget children of the top level window and make sure the context is attached by sending a MacGLWindowChange event. The check in qt_mac_update_child_gl_widgets() for a top level window had to be removed for this approach to work, but should be okey as we're only iterating the children. Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com> Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
| | | * Reduce memory consumption of QtScript/JSC on SymbianKent Hansen2010-09-028-4/+295
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of Jay's patch from https://bugs.webkit.org/show_bug.cgi?id=34349 with minor modifications. Even though the original patch was rejected upstream and has been superseded by the patches for https://bugs.webkit.org/show_bug.cgi?id=43185, those patches are more involved (affecting all platforms), hence difficult/risky to backport. Task-number: QTBUG-13361 Reviewed-by: Simon Hausmann
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-09-02152-2011/+3238
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-0212-497/+223
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC Rewrite ucstrcmp in terms of ucstrncmp Reorganise qelapsedtimer_unix.cpp for better inlining performance. Update the cpuid code to be better Revert "Restore default if to system default on session close."
| | | | | * Doc: Updated Supported Platforms page. FinishedMorten Engvoldsen2010-09-021-22/+20
| | | | | |
| | | | | * New binary of configure.exe with -mp/-no-mp optionMarius Storm-Olsen2010-09-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | | * Turn Makefile.win32 into batch-mode, enable /MP and PCHMarius Storm-Olsen2010-09-021-308/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make compiling qmake quite a bit faster, since less invokations of the compiler is needed, every compile unit starts of with a already known state, and all the CPU cores are used to compile the units. Reviewed-by: bhughes Reviewed-by: ossi
| | | | | * Add option to enable -MP compile option for MSVCMarius Storm-Olsen2010-09-024-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option is on when building Qt, but off by default for other projects, due to potential incompatible compile options in other projects. (/E, /EP, /Gm, /Yc, /showIncludes, #import preprocessor directive) Reviewed-by: bhughes Reviewed-by: ossi
| | | | | * Rewrite ucstrcmp in terms of ucstrncmpThiago Macieira2010-09-021-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Bradley T. Hughes
| | | | | * Reorganise qelapsedtimer_unix.cpp for better inlining performance.Thiago Macieira2010-09-021-55/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Benchmarks indicate no more than 5% improvement in the calls to elapsed(). Reviewed-by: Bradley T. Hughes
| | | | | * Update the cpuid code to be betterThiago Macieira2010-09-021-69/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to test and retest if the cpuid instruction is present on 32-bit. There's no need to test it at all on 64-bit. We don't know why, but it also fixes some problems on 64-bit. Approving-nod-from: Bradley Hughes
| | | | | * Revert "Restore default if to system default on session close."Aaron McCarthy2010-09-022-29/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bce4c42a3d0c7d24009230e09aa58db60db39d40. This change did not have the desired effect on Symbian versions prior to Symbian^3. Conflicts: src/plugins/bearer/symbian/qnetworksession_impl.cpp
| | | * | | Doc: Changed the default URL to avoid a Flash plugin crash on x86-64.David Boddie2010-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kevin Wright
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-024-11/+167
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbian: return better default font for SansSerif style hint Removing a left over #if 1..#endif construct Fixed a few warnings. Fixed a bug where passwords would not be committed when confirming.
| | * | | | | Symbian: return better default font for SansSerif style hintAlessandro Portale2010-09-021-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest QtWebkit will use QFont::defaultFamily() with style hints to ask for the appropriate default fonts on a system. This patch makes sure thath "Nokia Sans S60" and "Series 60 Sans" are prioritized for QFont::SansSerif, if they are present. Task-Number: QTBUG-12611
| | * | | | | Removing a left over #if 1..#endif constructAlessandro Portale2010-09-021-8/+1
| | | | | | |
| | * | | | | Fixed a few warnings.axis2010-09-021-3/+1
| | | | | | |
| | * | | | | Fixed a bug where passwords would not be committed when confirming.axis2010-09-023-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug happened when you were typing a password and pressing "Done" softkey very quickly. Because of the temporarily visible character, the widget would not contain the full string at the time of softkey triggering, only the *** part. Fixed by having the input context listen for softkey (command) events and commit the temporary character before the softkey action is triggered. AutoTest: Included Task: QTBUG-12949 RevBy: Miikka Heikkinen
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-026-10/+9
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix broken S60 build Keep mirrored char handling consistent between some font engines Fix symbol font detection in generic CMap decoding Minor performance improvement to QGraphicsItem::update.
| | * | | | | Fix broken S60 buildJiang Jiang2010-09-022-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Liang Qi
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-025-10/+3
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Keep mirrored char handling consistent between some font engines Fix symbol font detection in generic CMap decoding Minor performance improvement to QGraphicsItem::update.
| | | * | | | Keep mirrored char handling consistent between some font enginesJiang Jiang2010-09-023-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirrored character subsitution should be used in right-to-left text direction unless the font is a symbol font. This patch will keep this behavior consistent between FreeType, QPF and S60 font engines. For Mac font engines, the shaping process is delegated to Core Text or ATSUI, so we don't do mirrored char handling by ourselves. Task-number: QTBUG-3852 Reviewed-by: Lars Knoll
| | | * | | | Fix symbol font detection in generic CMap decodingJiang Jiang2010-09-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For fonts that have an AppleRoman name table, *isSymbolFont failed to return correct value even if they have a symbol table. This patch corrected this behavior by using symbolTable variable to detect that instead of checking if score == Symbol. Also prefer symbol table over AppleRoman table to make generic CMap decoding consistent with QFontEngineFT (which will use the symbol table whenever its available). Task-number: QTBUG-3852 Reviewed-by: Lars Knoll
| | | * | | | Minor performance improvement to QGraphicsItem::update.Bjørn Erik Nilsen2010-09-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by other teams in Nokia. Avoid calling discardUpdateRequest() twice, first in update() and then in markDirty(). No-brainer. Task-number: QTBUG-10817 Reviewed-by: Trustme
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-027-3/+61
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Document known limitations in UI performance on S60 5.0 based devices. Update QDesktopWidget geometry when S60 furniture visibility changes Prevent null pointer dereference
| | * | | | Document known limitations in UI performance on S60 5.0 based devices.Jani Hautakangas2010-09-025-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11333 Reviewed-by: axis
| | * | | | Update QDesktopWidget geometry when S60 furniture visibility changesGareth Stockwell2010-09-022-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13204 Reviewed-by: axis
| | * | | | Prevent null pointer dereferenceGareth Stockwell2010-09-021-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13204 Reviewed-by: axis
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-022-4/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "QLineEdit cursor is shown when asked to be non-visible" Fixed Symbian builds after introduction of boilerplate code.
| | * | | | Revert "QLineEdit cursor is shown when asked to be non-visible"axis2010-09-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9ef61d3d1e53d32dc2568cbfb9f8ff5b19cb4ffc.
| | * | | | Fixed Symbian builds after introduction of boilerplate code.axis2010-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully the linux-armcc and linux-gcce mkspecs will be renamed later, but until then, we need this fix. RevBy: Trust me
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-0221-75/+571
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't overflow the unreferenced cost counter Remove extra strings The declarative parser should only save comment text (and not /*,*/,//) Support for qsTrId and meta-data in comments for QML. Flickable ensure internal pressed state is cleared when mouse is released. Fix examples autotest Support JS "in" operator on QML objects Only emit change signal when variant properties actually change Use QApplication in QDeclarativeEngine example. Maintain high score name dialog length, as well as name.
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-02139-1993/+2621
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-09-02380-4477/+15646
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-0116-64/+531
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: The declarative parser should only save comment text (and not /*,*/,//) Support for qsTrId and meta-data in comments for QML. Flickable ensure internal pressed state is cleared when mouse is released. Fix examples autotest Support JS "in" operator on QML objects Only emit change signal when variant properties actually change Use QApplication in QDeclarativeEngine example.
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-0116-64/+531
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: The declarative parser should only save comment text (and not /*,*/,//) Support for qsTrId and meta-data in comments for QML. Flickable ensure internal pressed state is cleared when mouse is released. Fix examples autotest Support JS "in" operator on QML objects Only emit change signal when variant properties actually change Use QApplication in QDeclarativeEngine example.
| | | | | | * | | The declarative parser should only save comment text (and not /*,*/,//)Michael Brasser2010-09-012-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Roberto Raggi
| | | | | | * | | Support for qsTrId and meta-data in comments for QML.Michael Brasser2010-09-015-2/+456
| | | | | | | | |
| | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-0111-59/+74
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Flickable ensure internal pressed state is cleared when mouse is released. Fix examples autotest Support JS "in" operator on QML objects Only emit change signal when variant properties actually change Use QApplication in QDeclarativeEngine example.
| | | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-019-54/+66
| | | | | | | |\ \ \
| | | | | | | | * | | Fix examples autotestJoona Petrell2010-09-013-49/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Bea Lam
| | | | | | | * | | | Flickable ensure internal pressed state is cleared when mouse is released.Martin Jones2010-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We did this when handling the mouse events ourselves, but if e.g. a mousearea stole the mouse, we didn't reset the pressed flag. Task-number: QTBUG-12343
| | | * | | | | | | | Remove extra stringsAlan Alpert2010-09-021-3/+1
| | | | | | | | | | |