summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix QWS autotests after S60 integrationPaul Olav Tvete2009-09-085-5/+0
| | | | Reviewed-by: trustme
* Added a public function to enforce usage og the old GL engine.Trond Kjernåsen2009-09-085-11/+87
| | | | | | | | | | | Some applications that uses a mix of OpenGL and QPainter code may not work correctly with the new GL 2 engine (e.g. the composition demo). The same is most likely also true for user apps, therefore we need a way to enforce the usage of the old GL 1 engine for the sake of compatibility. Task-number: 260872 Reviewed-by: Samuel
* QScriptDebuggerBackend crash fix.Jedrzej Nowacki2009-09-081-7/+1
| | | | | | | | | | QScriptDebuggerBackend::contextCount() method was trying to count number of context push & pop and result was not equal to elements count in QScriptDebuggerBackend::contextIds() list. Patch change QScriptDebuggerBackend::contextCount() to call count() on ids list. Task-number: 260719 Reviewed-by: Kent Hansen
* fix major memory leak in JavaScriptCore RegisterFile on Windows CEJoerg Bornemann2009-09-081-0/+3
| | | | | | | | On Widows CE we must decommit all committed pages before we release them. See VirtualFree documentation. Desktop Windows behaves much smoother in this situation. Reviewed-by: ariya
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-081-7/+10
|\
| * Make tst_qmdiarea more robustOlivier Goffart2009-09-081-7/+10
| |
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-0864-1079/+514
|\ \ | |/
| * Add license header.Jason McDonald2009-09-081-0/+41
| | | | | | | | Reviewed-by: Trust Me
| * Fixed QLineEdit to correctly adjust the horizontal scrollingAdriano Rezende2009-09-082-1/+7
| | | | | | | | | | | | | | | | | | The widget needs to use the naturalTextWidth to adjust the horizontal scrolling, otherwise it will not fit correctly the text in the visible area when resized. Merge-request: 1410 Reviewed-by: Alan Alpert
| * Fixes a regression in QListView in 4.6 regarding the selectionThierry Bastian2009-09-082-0/+34
| | | | | | | | | | | | | | In icon mode, if you click on the viewport (with extended selection), the selection should be cleared when you release the mouse button. Reviewed-by: ogoffart
| * Animations of redocking widgets are brokenThierry Bastian2009-09-081-2/+15
| | | | | | | | | | | | | | | | The problem is that when starting an animation, we delay it by starting a 0-timer. That doesn't work on windows while dragging a native window. Task-number: 260772 Reviewed-by: prasanth
| * doc: Fixed several qdoc errors.Martin Smith2009-09-083-4/+11
| | | | | | | | That's the last of them... for now.
| * Try to make test more robust.Olivier Goffart2009-09-0816-84/+130
| | | | | | | | | | | | | | | | By using QTRY_{COMPARE,VERIFY} instead of waiting an arbitrary amount of time waiting for the window manager to do his job. Also use QApplication::setActiveWindow which seems to be more robust then QWidget::activateWindow
| * Fix autotestmae2009-09-081-0/+8
| | | | | | | | | | The piece table test relied on previous automatic edit command grouping. The grouping now has to be enforced explicitely with beginEditGroup()/endEditGroup()
| * Tests: Do not execute network tests at all if DNS setup is broken.Markus Goetz2009-09-081-0/+15
| | | | | | | | Reviewed-by: Jesper
| * mkspec wince60standard-x86-msvc2005 addedJoerg Bornemann2009-09-083-73/+76
| | | | | | | | | | | | | | This is a mkspec template for creating x86 Windows CE 6 mkspecs. Task-number: 259850 Reviewed-by: mauricek
| * use a single qplatformdefs.h for all Windows CE mkspecsJoerg Bornemann2009-09-0830-908/+160
| | | | | | | | | | | | | | | | | | Additionally, mkspecs/wince.conf was moved to mkspecs/common/wince/qmake.conf The common qplatformdefs.h is also in that directory. Task-number: 259850 Reviewed-by: mauricek
| * make JavaScriptCore compile on platforms with case-insensitive file systemKent Hansen2009-09-083-5/+5
| | | | | | | | | | | | | | | | There's a clash between "TypeInfo.h" and a standard header "typeinfo.h" that's included from a place we don't control. The fix is to rename "TypeInfo.h" to "JSTypeInfo.h". Reviewed-by: Simon Hausmann
| * Merge commit 'origin/4.5' into 4.6Joerg Bornemann2009-09-081-2/+12
| |\ | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp
| | * Doc: keypad navigation is supported on Windows CEJoerg Bornemann2009-09-081-2/+10
| | | | | | | | | | | | Reviewed-by: thartman
* | | Fixed resolving absolute paths in Symbian.Miikka Heikkinen2009-09-082-8/+29
|/ / | | | | | | | | | | | | | | | | | | Fixed resolving absolute path using QFileInfo for paths that were relative but contained the drive letter (e.g. "c:my.dll"). Absolute paths should now be properly cleaned in Symbian, too. Task-number: 255326 Reviewed-by: Janne Anttila
* | Fixed some focus-related tst_qlineedit failures.Rohan McGovern2009-09-081-4/+5
| | | | | | | | | | | | There are many places where the test assumes that a widget gets focus after some fixed timeout. Change it to block until the widget really gets focus.
* | QAudioDeviceInfo::deviceList() wasn't working correctly if no audioKurt Korbatits2009-09-081-2/+3
| | | | | | | | | | | | | | | | | | device. The default was being added even when no audio devices were available. Change so that the default device is only added if there is at least one audio device. Reviewed-by:Bill King
* | Add operator== and != to QGLFramebufferObjectFormatRhys Weatherley2009-09-084-6/+81
| | | | | | | | Reviewed-by: Sarah Smith
* | Port examples/opengl/textures to OpenGL/ES 1.1Rhys Weatherley2009-09-084-38/+51
| | | | | | | | Reviewed-by: Sarah Smith
* | Texture format must be GL_RGB when pixel type is GL_UNSIGNED_SHORT_5_6_5Rhys Weatherley2009-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | QImage::Format_RGB16 textures were broken on some OpenGL/ES 1.1 systems because the "format" was set to GL_RGBA and the "texture_format" was set to GL_RGB, with a pixel type of GL_UNSIGNED_SHORT_5_6_5. OpenGL/ES 1.1, ES 2.0, and desktop GL all require the two format parameters to glTexImage2D() to be GL_RGB if the pixel type is GL_UNSIGNED_SHORT_5_6_5. Reviewed-by: Sarah Smith
* | Make the matrix and viewport logic in renderText() a bit betterRhys Weatherley2009-09-081-50/+137
| | | | | | | | | | | | | | The original renderText() was using the highly unportable (to OpenGL/ES) glGetDoublev() and glGetIntegerv() functions. Reviewed-by: Sarah Smith
* | Convert QGLFramebufferObjectFormat to use implicit sharingRhys Weatherley2009-09-082-16/+59
| | | | | | | | Reviewed-by: Sarah Smith
* | Fixed the spelling of canceled in the QGesture api brought up by David Boddie.Denis Dzyubenko2009-09-072-6/+6
| | | | | | | | Reviewed-by: trustme
* | Only depend on phonon when building webkit if phonon was configured forAndy Shaw2009-09-071-1/+2
| | | | | | | | Reviewed-by: Denis
* | Remove extra invalid semi-colonThiago Macieira2009-09-071-1/+1
| | | | | | | | Reviewed-By: Trust Me
* | Fixed compile failure on Mac OS X.Samuel Rødal2009-09-071-2/+1
| |
* | Network tests: Fix typo in network-settings.h to make it compileMarkus Goetz2009-09-071-1/+1
| |
* | tst_qnetworkreply: Check for NoError before event loop timeout.Markus Goetz2009-09-071-0/+7
| | | | | | | | | | | | | | This makes sure we show a proper "Host not found" error instead of the "Event loop timed out". Rev-By: Peter Hartmann
* | Use icons on QDialogButtonBox in KDEJens Bache-Wiig2009-09-074-15/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | Oxygen did not use icons in dialogs. This is obviously incorrect compared with other KDE apps. We changed common style to enable button icons by default on X11 and explicitly disabled them for Windows and Motif styles. We also updated the icons for YES and NO actions to use dialog-ok and process-stop to reflect the usaged in KDE itself. Reviewed-by: ogoffart
* | Fix warning when compiling with QT_NO_EXCEPTIONSOlivier Goffart2009-09-071-1/+1
| | | | | | | | | | | | src/corelib/global/qglobal.h:1368:1: warning: "QT_NO_EXCEPTIONS" redefined Reviewed-by: Alexis
* | Fix a crash in the Win32 event dispatcherBradley T. Hughes2009-09-071-0/+2
| | | | | | | | | | | | | | | | Not clearing the timerVec and timerDict containers can cause crashes during application shutdown when code tries to unregister timers (that were unregistered in closingDown()). Reviewed-by: dt
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-0719-80/+283
|\ \
| * | Fix crash on QGraphicsItem destruction related to focus handlingKai Koehne2009-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Do not call clearFocus() for child item in setParentItemHelper() if called from destructor: At this time, the ~QGraphicsItem destructor already deleted all its children. Reviewed-by: Andreas Aardal Hanssen
| * | Doc: Minor adjustments to the rogue example docs.Geir Vattekar2009-09-071-8/+8
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Fix QScriptEngineAgent::functionExit (JIT enabled)Jedrzej Nowacki2009-09-073-17/+4
| | | | | | | | | | | | | | | | | | | | | Event functionExit was fixed, now returnValue is correctly passed as an argument to debugger. Few QEXCEPT_FAIL were removed from autotest. Reviewed-by: Kent Hansen
| * | Fix QScriptEngineAgent::exceptionCatch (JIT enabled)Jedrzej Nowacki2009-09-073-5/+4
| | | | | | | | | | | | | | | | | | | | | Event exceptionCatch fixed, now exceptionValue is correctly passed as an argument to debugger. Two QEXCEPT_FAIL were removed from autotest. Reviewed-by: Kent Hansen
| * | Doc: Added a note that a state machine requires a running event loop.David Boddie2009-09-072-31/+26
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Fixed crash in print preview dialog with graphicssystem OpenGL.Kim Motoyoshi Kalland2009-09-071-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | Avoid crashing when framebuffer object created in one context is used in a shared context after the original context is destroyed. Task-number: 260874 Reviewed-by: Samuel
| * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-0714-28/+473
| |\ \
| | * | Doc: Some animation examples had no docs in qtdemo.Geir Vattekar2009-09-0710-1/+208
| | | | | | | | | | | | | | | | | | | | Task-number: 260779 Reviewed-by: Morten Engvoldsen
| * | | Re-added Symbian specific plugins documentation that had gotten lost.Miikka Heikkinen2009-09-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation structure changes had caused Symbian plugin documentation to be lost, so revised and re-added it to plugins-howto.qdoc. Reviewed-by: Janne Anttila
* | | | Minor fix to network-settings.h in Symbian OSJanne Anttila2009-09-071-5/+4
| |/ / |/| | | | | | | | Reviewed-by: Aleksandar Sasha Babic
* | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-077-17/+296
|\ \ \
| * | | New Benchmark: file:// with QFile vs QNetworkAccessManagerMarkus Goetz2009-09-073-0/+172
| |/ / | | | | | | | | | Reviewed-by: Leo