summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | Ammend last commitHarald Fernengel2011-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squelch coding style warnings
| | * | | | | | | Implemented QAccessibleTextEdit::attributes()José Millán Soto2011-06-062-5/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handling font properties and colors Created test: tst_QAccessibility::textAttributes Merge-request: 2626 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | Changing cursor position in all boundariesJosé Millán Soto2011-06-062-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1242 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | code clean-up for QSystemSemaphoreRitt Konstantin2011-06-064-61/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1248 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | simplify QSharedMemoryPrivate::cleanHandle()Ritt Konstantin2011-06-065-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by making it return nothing as it's result should be ignored anyways (initKey() and detach() could return false because of it - which is wrong) Merge-request: 1248 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | minor improvements for QSharedMemoryRitt Konstantin2011-06-065-80/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unused includes; generate error string if error occurred only; make some error strings equal on different platforms; avoid code duplication; minor code simlifications and clean-ups Merge-request: 1248 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | fix potential keyfile leakingRitt Konstantin2011-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | according to close(2) manpages, it could return with EINTR; use EINTR-safe version of close() from qcore_unix_p.h Merge-request: 1248 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | refactoring of the QWSSharedMemory classRitt Konstantin2011-06-062-107/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drop old/unused API and obsolete code; improve attach() for comon case; cache the shm size at the first call; fix the includes; better debug strings; minor code clean-ups Merge-request: 1247 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | allow the user to averride QT_QWS_TEMP_DIR in qplatformdefs.hRitt Konstantin2011-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | minor typo fixRitt Konstantin2011-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | minor code simplificationRitt Konstantin2011-06-061-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is no need in non-const object as we don't change it anyways Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | minor code simplificationRitt Konstantin2011-06-062-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ascii` wasn't used Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | avoid the QT_NO_ASCII warningRitt Konstantin2011-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | remove an unused headersRitt Konstantin2011-06-061-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these headers weren't used anymore since QLock, QWSLock and QWSSharedMemory classes had been introduced Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | nano optimizationRitt Konstantin2011-06-061-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocate uninitialized QByteArray as it will be initialized few lines later Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | don't reallocate memory if the old buffer has sufficient capacityRitt Konstantin2011-06-061-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | fix potential memory leakingRitt Konstantin2011-06-061-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the `memsize` member was never set with anything but 0; so, the memory newer was freed neither in destructor, neither in releaseSurface(). for the first one it was non-critical because of the memory was freed indirectly - by hiding widget before closing (which is why the issue wasn't catched-up until now) Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | don't delete the lock if it was not created by this surfaceRitt Konstantin2011-06-061-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and don't forget about it otherwise Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | QSessionManager: fix build on QWSRitt Konstantin2011-06-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | | | "fix" license headersOswald Buddenhagen2011-06-029-126/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our policy and even more its implementation is mildly braindead ...
| | * | | | | | | need no qlibraryinfo any moreOswald Buddenhagen2011-06-012-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we call qmake now
| | * | | | | | | remove dead variablesOswald Buddenhagen2011-06-011-17/+3
| | | | | | | | |
| | * | | | | | | optimization: avoid creating unnecessary temporariesOswald Buddenhagen2011-06-011-35/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erase messages instead of building a new list of non-dropped ones. modify messages instead of replacing them with modified copies.
| | * | | | | | | add hash-based indexing to Translator for fast find()Oswald Buddenhagen2011-06-012-26/+92
| | | | | | | | |
| | * | | | | | | remove Translator::translatedMessages()Oswald Buddenhagen2011-06-013-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's inefficient to construct a new list. on top of that, the only user actually checks the message state again.
| | * | | | | | | remove Translator::contains()Oswald Buddenhagen2011-06-013-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's redundant with find() now, as the latter is cheap now
| | * | | | | | | optimization: make the Translator::find() api index-basedOswald Buddenhagen2011-06-013-35/+38
| | | | | | | | |
| | * | | | | | | fix misnomer: MainWindow::closePhraseBooks() => maybeSavePhraseBooks()Oswald Buddenhagen2011-06-012-3/+3
| | | | | | | | |
| | * | | | | | | nuke Translator::release(), make saveQM() non-static insteadOswald Buddenhagen2011-06-015-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this "factory" served only to obfuscate the code
| | * | | | | | | synchronize qmake project parser with qt creatorOswald Buddenhagen2011-06-0114-2580/+4708
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt creator as of ddb918f. not feeling like replaying the whole history ...
| * | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-06-08159-1526/+9423
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits) Update internal state before emitting configurationChanged() signals. Fixed qmlshadersplugin manual test shaders on SGX family GPU:s. Fixed qmlshadersplugin on windows VC2008 toolchain. Reset input context in Symbian when another window is opened. KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget() Close context menus during orientation change. Have -small-screen enabled in certain examples on Symbian always. Update Japanese translations. Revert some of "Make QMLViewer startup animation stop after a while" Fix for winscw QtGui.def Add private method for flushing the pixmap cache. QDeclarative: Fix QPerformanceTimer on Symbian Fix QTreeWidget autotest cases on Symbian/VGA Increase SSL readbuffer 1 -> 16 kB Fix pixel metrics for Symbian VGA devices Revert "Fix QNetworkConfigurationManager usage outside main thread first" Avoid buffer overrun in QMacPixmapData resizing Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting Fix tst_QGraphicsItem::sorting() test case for Symbian Fix QHeaderView test case for VGA Symbian devices. ...
| | * \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-081-0/+1
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-081-0/+1
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update internal state before emitting configurationChanged() signals.
| | | | * | | | | | | | Update internal state before emitting configurationChanged() signals.Xizhi Zhu2011-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PMO Bug 257336.
| | * | | | | | | | | | Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7Toby Tomkins2011-06-0857-1436/+500
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qs60style.cpp
| | * | | | | | | | | | Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7Toby Tomkins2011-06-086-15/+20
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-06-085-15/+15
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed qmlshadersplugin manual test shaders on SGX family GPU:s. Fixed qmlshadersplugin on windows VC2008 toolchain.
| | | | * | | | | | | | | Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.Marko Niemelä2011-06-084-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SGX GPU requires precision definitions for all variables. Additionally some unnecessary semicolons were removed. Reviewed-by: Kim Gronholm
| | | | * | | | | | | | | Fixed qmlshadersplugin on windows VC2008 toolchain.Marko Niemelä2011-06-081-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix is originally submitted by George Tavares. APIENTRY is a Win32 macro defined as stdcall__ * Reviewed-by: Kim Gronholm
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-06-071-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Reset input context in Symbian when another window is opened.
| | | | * | | | | | | | | Reset input context in Symbian when another window is opened.Miikka Heikkinen2011-06-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When symbol menu is opened, input context needs to be reset or preedit string duplication may occur after symbol menu is closed. Task-number: QTBUG-19528 Reviewed-by: Sami Merila
| | * | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-077-0/+31
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-06-071-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()
| | | | * | | | | | | | | KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()Sami Merila2011-06-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no check if graphics view pointer is null in the SLOT function translateInputWidget(). Task-number: QTBUG-19734 Reviewed-by: Miikka Heikkinen
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-06-066-0/+29
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Close context menus during orientation change. Have -small-screen enabled in certain examples on Symbian always.
| | | | * | | | | | | | | Close context menus during orientation change.Laszlo Agocs2011-06-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make non-native QMenus, i.e. context menus, work like in Avkon. Reviewed-by: Miikka Heikkinen Reviewed-by: Sami Merila Task-number: QTBUG-19656
| | | | * | | | | | | | | Have -small-screen enabled in certain examples on Symbian always.Laszlo Agocs2011-06-065-0/+22
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-067-168/+274
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-067-168/+274
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update Japanese translations.
| | | | * | | | | | | | | Update Japanese translations.Takumi ASAKI2011-06-067-168/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix some inconsistent translations. * Translate some missing messages. * Update Japanese phrasebook. Merge-request: 1249 Reviewed-by: ossi