summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Kill warning, simplify code.Frans Englich2009-10-161-2/+4
| | | | Reviewed-by: TrustMe
* Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-16104-1332/+1761
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-160-0/+0
| |\
| | * Merge commit 'v4.6.0-beta1' into 4.6Thiago Macieira2009-10-160-0/+0
| | |\
| | | * Work around broken ATI X1600 drivers on Mac OS Xv4.6.0-beta1Gunnar Sletta2009-10-131-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GLSL implementation messes up return values from functions so that all our srcPixel()'s become black and several matrices are off. We don't want to rewrite the shader code to fit an "ancient" graphics card, so we simply fall back to the GL 1 engine. Reviewed-by: Trond (cherry picked from commit 33ed3d0bacddce214a43be60eb6481903e753a88) (cherry picked from commit bd94c6df873ab196e537f5a49b57c86ccd66ad90)
| | | * Add known issues wiki to docs.Jesper Thomschutz2009-10-131-0/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jason McDonald (cherry picked from commit 1ac2f104b7ab97f99a2b249b14bc5129588dbe46)
| | | * Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39Jocelyn Turcotte2009-10-131-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by Simon Hausmann Fix crash of QtScript on Mac OS X When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause it to crash. For now fall back to the use of mmap() as allocator instead. Reviewed-by: Kent Hansen (cherry picked from commit 6b8ac349b9a477863a8c8388dcc0658f3284bc54)
| | | * crash fix on WinCE without gesture supportMaurice Kalinowski2009-10-131-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd9d8693 added some checks causing SetGestureConfig to not be initialized to 0. Thus it gets derefenced and causes crashes on all WinCE applications. Reviewed-by: denis Reviewed-by: ninerider (cherry picked from commit fa4d78a580fb4deb0c2c5de253b3b18a4ad18ab3)
| | | * Workaround for softkeys not working in modal dialogs on S60 5.0Shane Kearns2009-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the softkey container window to be selectable even when pointer is grabbed (via window server setting) Task-number: QT-2203 Reviewed-by: Espen Riskedal (cherry picked from commit 6ce22194f16ce8e2586e3787560de051064d7787)
| | | * A new implementation of the Gesture API.Denis Dzyubenko2009-10-0963-1853/+3296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented gestures using gesture events and separate QGesture/QGestureRecognizer classes. Reviewed-by: trustme
| | | * Color role with higher contrast for focusrectAlessandro Portale2009-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Low-risk, high value change. Beta worthy! As much as QPalette::Highlight sounds like a suitable color role for drawing a focus rect... It simply did not work well with a lot of S60 themes (e.g. the default N95 theme). QPalette::Text is a better candidate, since the S60 themes promise a good contrast of text on background graphics. Reviewed-By: Sami Merilä (cherry picked from commit a35c52abe95f224af062550e4954f7cbefca1bd8)
| | | * Fixed documentation links in README.s60Miikka Heikkinen2009-10-091-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4806 Reviewed-by: Janne Koskinen (cherry picked from commit 07456fc966504c18465d80b988038b009349a0fa)
| | | * Changed several S60 references to Symbian references in docs.Miikka Heikkinen2009-10-093-17/+15
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Janne Koskinen (cherry picked from commit 37253e2c1c6a8b1dede8f261fb40d8442008f6d8)
| | | * Fixed miscellaneous minor problems with Symbian docs.Miikka Heikkinen2009-10-093-7/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Espen Riskedal (cherry picked from commit d66df793b88f9ba924a1fefcec325d7c04af3ac3)
| | | * Changing S60 to Symbian in the DocsMorten Engvoldsen2009-10-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing names to Symbian platform Task-number: QT-2268 Rev-by: Espen Riskedal (cherry picked from commit 7d75f1427f80df87b728baa8c7f63f7a7762d280)
| | | * Changing S60 to Symbian in the DocsMorten Engvoldsen2009-10-095-82/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing names to Symbian platform Task-number: QT-2268 Rev-by: Espen Riskedal (cherry picked from commit dac817b8d3bbcfcad34295f134dfafbf0a26c23f)
| | | * Doc: update known issues page (a little).Volker Hilsheimer2009-10-091-78/+62
| | | | | | | | | | | | | | | | (cherry picked from commit 21a84b26028ec7f44c9c5c69fa17528e77e17174)
| | | * Fix compile errors on mingw (The version supplied with Qt 4.5)Prasanth Ullattil2009-10-084-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the missing defines Reviewed-by: Denis (cherry picked from commit 1040ba2fd850196234424f769e28d513a6eb0948)
| | | * mediaplayer: crash in settings dialog.Frans Englich2009-10-073-15/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MediaPlayer requires that an output device is available. Task-number: QTBUG-4755 Reviewed-by: Gareth Stockwell (cherry picked from commit 16e21cb0beb0e5f5189048b95d1cb74ae0c0702a)
| | | * Fixed initialization of the system locale on Symbian.Denis Dzyubenko2009-10-071-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made it thread-safe and actually make sure that we don't initialize the data several times. Reviewed-by: axis (cherry picked from commit 0418d438d1c1acfe2c95ee748c1e7c84a0ee8837)
| | | * Fixed a crash bug on S60 SDK 3.1.axis2009-10-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash was caused by the image data not being locked before being accessed. Also avoided an unnecessary detach copy by making the image variable a reference. RevBy: Jani Hautakangas Task: QTBUG-4705 AutoTest: QWidget passed (cherry picked from commit 330dc1e5895a8950615a9bbf26154f5387b023b1)
| | | * 2009-10-07 Janne Koskinen <janne.p.koskinen@digia.com>Janne Koskinen2009-10-072-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Simon Hausmann. [Qt] Symbian SBSv2 .data segment adress fix https://bugs.webkit.org/show_bug.cgi?id=30157 RO-section in qtwebkit.dll exceeds allocated space in SBSv2. Move RW-section base address to start from 0x800000 instead of the toolchain default 0x400000 * WebCore.pro: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49239 268f45cc-cd09-0410-ab3c-d52691b4dbfc (cherry picked from commit d73ea9d00fec200b2dd6de5e4c8f298caffa4aca)
| | | * 2009-10-06 Janne Koskinen <janne.p.koskinen@digia.com>Janne Koskinen2009-10-072-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Simon Hausmann. [Qt] don't enable input methods on Symbian by default. https://bugs.webkit.org/show_bug.cgi?id=30117 If input methods are enabled Symbian FEP will be launched on every pointer event making webpage navigation impossible with QWebView. * Api/qwebview.cpp: (QWebView::QWebView): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49188 268f45cc-cd09-0410-ab3c-d52691b4dbfc (cherry picked from commit 9c23f571341811b07606db79dd4a4d44ff98acc1)
| | | * Revert "There's no need to include qstringmatcher.h in qstringlist.h"Marius Storm-Olsen2009-10-072-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source-incompatible change This reverts commit 8714892977269591bb9b348c6eb549a7f2c45cbc. Rev-by: Trustme (cherry picked from commit 136f866f405a60ddbc48e4c666a0fec484f24717)
| | | * Doc update related to Qt package name for Symbian (a3ef6e08).Janne Anttila2009-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-772 Reviewed-by: TrustMe (cherry picked from commit 2fe4f4a98e1c0b727ee9fa9d168d726a9dcb36d7)
| | | * Update self-signed certificate for Symbian, since the old one expiredIain2009-10-071-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New certificate for using for self-signing. Updated some organisational details, gave this one a 10 year validity rather than a 1 year validity. Same private key as before. Reviewed-by: axis (cherry picked from commit 53ea5e98eab90ee9e3ae23e3b67e8993e6c2b31c)
| | | * Fix build error introduced in change ffeb6900.Jason McDonald2009-10-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change ffeb6900 renamed a function but didn't rename all the calls. Reviewed-by: Trust Me (cherry picked from commit 8b7e766aa42739df8998ec9c1e94087b965ac87b)
| | | * Fixed thread lockup in win32 backend for QAudioOutput.Kurt Korbatits2009-10-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Was not closing the WaveOut on cleanup, fixed. -Was emitting signal in critical section, fixed. Reviewed-by:Bill King (cherry picked from commit 3865912d4a6c31a4981e1831e2af8d59f3eb4ac0)
| | | * Update EABI DEF files for Symbian OSIain2009-10-075-40/+157
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe (cherry picked from commit 2d2b4e8a77a30449d8b4ebc88979b3aff45a8222)
| | | * Autotest: add a few more tests, with IP address and actual hostnameJason McDonald2009-10-071-4/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d47b7e6d0adcd675ba9da11818b3fa9acc3caff5) Conflicts: tests/auto/networkselftest/tst_networkselftest.cpp
| | | * Autotest: use port 12346 instead of 1, to ensure that it's not aThiago Macieira2009-10-071-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | firewall issue Also check if we're not timing out instead of being able to fail. (cherry picked from commit 9cf618492d1c89b489bf7e52e45c9577f9d52c1c)
| | | * API review: change function name to setUseSystemConfiguration.Thiago Macieira2009-10-072-3/+3
| | | | | | | | | | | | | | | | | | | | Requested-By: Volker Hilsheimer (cherry picked from commit ffeb69003a9c676064cdf7ec099a02c2fbcf2ad3)
| | | * Prevent OK key being processed twice in file dialog (keypad navigation)Shane Kearns2009-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All key events were being explicitly ignored by the file dialog when key navigation is enabled, and it doesn't have edit focus. When a file is opened by pressing the OK key, there is no edit focus after returning from accept() and the OK key can propagate outside the modal dialog. This causes the parent widget to receive and act upon the OK key as well which makes problems - e.g. in QTBUG-4724, recursive menu activation Task-number: QTBUG-4724 Reviewed-by: Alessandro Portale (cherry picked from commit 28cdb974cce58111a19e8691f4dd929a5c9f74ea)
| | | * Optimized restore() in GL 2 paint engine.Samuel Rødal2009-10-072-19/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of what state actually changed so we don't have to set all the uniforms as dirty etc. Reviewed-by: Trond (cherry picked from commit 092c773b95b1f126d36ab7c918fb098ddad6cae3)
| | | * Changed GL 2 engine render text implementation to use glDepthRange().Samuel Rødal2009-10-072-16/+30
| | | | | | | | | | | | | | | | | | | | This frees all the current dependencies on the depth uniform. (cherry picked from commit 27c2df52128e32c785239dbc9322a4b7beb0078c)
| | | * QScriptContext::parentContext: don't skip unessecary framesOlivier Goffart2009-10-072-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling QScriptValue::call doesn't create a fake frame. We can detect a real fake frame as it does not have a callee. Task-number: QT-2270 Reviewed-by: Kent Hansen (cherry picked from commit 96b047f0f27674ee402ab3624dbb906346ac1847)
| | | * Removed ICON for apps and demos except fluidlauncher and desktopservicesEspen Riskedal2009-10-073-31/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mifconv can't always handle absolute paths to the .svg specified, so for now we don't use absolute paths, and fix it later. Task-number: QTBUG-4693 Reviewed-by: Shane Kearns (cherry picked from commit fa35247d31bd35d72c307f4a6a231400aade0c0b)
| | | * Better compile fix.Alexis Menard2009-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by:Thiago (cherry picked from commit 493eb0264c095c62b6573789225a22cadf946348)
| | | * Fix crash related to audio equalizer.Frans Englich2009-10-072-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The constructor initializer relied on member variables. Task-number: QTBUG-4689 (cherry picked from commit 54645071fad98b46a44d88b50095dc21ff63fff6)
| | | * tst_qnetworkreply: httpConnectionCount test improvementsMarkus Goetz2009-10-071-3/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe (cherry picked from commit 85b17ee0222d96bbd93f758ac3b2bd3139c76ec8)
| | | * Build fix.Alexis Menard2009-10-071-1/+1
| | | | | | | | | | | | | | | | (cherry picked from commit c81b79080eb8f0c956c97fc80d5118baf7703df4)
| | | * add test for QT-2270Kent Hansen2009-10-071-0/+17
| | | | | | | | | | | | | | | | (cherry picked from commit 56187037e3fe46800bfa670197a149121f00573e)
| | | * Needed to set ENABLE_YARR_JIT to not compile MacroAssembler.cppJørgen Lind2009-10-072-4/+16
| | | | | | | | | | | | | | | | | | | | Reviewed-by:Simon Hausmann <simon.hausmann@nokia.com> (cherry picked from commit 8037c03174124bc136900c88254d118ab48b010f)
| | | * tst_qhttpnetworkconnection: Some more checksMarkus Goetz2009-10-071-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some more checks (test still passes) Reviewed-by: TrustMe (cherry picked from commit 7cbcf8e8ef91636de1727d5bd6294a9f07c66804)
| | | * Fixing the compile bug for Symbian when using ARMV5Aleksandar Sasha Babic2009-10-072-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicit destructor was needed by compiler. Reviewed-by: Thiago Macieira (cherry picked from commit 15e2ecda958868b5c372bcd59cba8065c086581e)
| | | * Made depth tested renderText() work after stencil clipping change.Samuel Rødal2009-10-071-7/+10
| | | | | | | | | | | | | | | | | | | | Also we should force Raster_A8 glyph format in renderText(). (cherry picked from commit 9dbcdc00239abbaf899f04fc5ecc2bdb885ad08d)
| | | * Added convex polygon optimization to QGL2PaintEngineExPrivate::fill().Samuel Rødal2009-10-071-5/+4
| | | | | | | | | | | | | | | | (cherry picked from commit d846af0de2ee2b3b76f81f2c0fd3ccceb645b511)
| | | * Switched to using stencil instead of depth buffer for clipping.Samuel Rødal2009-10-072-121/+173
| | | | | | | | | | | | | | | | | | | | | | | | Based on Aaron Kennedy's patch. All tests are green, but when enabling scissoring UniteClip seems to be broken atm. (cherry picked from commit 6b623c04060d274c048c0d4c6dbc5a90d1c31604)
| | | * Moved GL 2 clip clearing code into a common function.Samuel Rødal2009-10-072-14/+15
| | | | | | | | | | | | | | | | (cherry picked from commit 6d17e09c274803d324e8a8db579aaafaefaab33f)
| | | * Got rid of some redundant state changes regarding GL depth state.Samuel Rødal2009-10-071-14/+9
| | | | | | | | | | | | | | | | (cherry picked from commit a815840a7f2272b128de4a52497626c49373c8c9)
generated by cgit v0.12 at 2024-10-25 21:35:11 (GMT)