summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cocoa: Implement single touch panRichard Moe Gustavsen2009-08-275-61/+85
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-2752-264/+1102
|\
| * Make it compile on Windows CE where min and max are predefined macros.Jan-Arve Sæther2009-08-271-11/+11
| | | | | | | | Reviewed-by: mauricek
| * QPropertyAnimation: use of QWeakPointer instead of QObject::connectThierry Bastian2009-08-273-33/+23
| |
| * Animation: reordering of private members saves 8 bytesThierry Bastian2009-08-271-3/+3
| | | | | | | | | | | | ...on the private object Reviewed-by: Trust Me
| * Doc: Small change to QProcess::waitForFinished()Geir Vattekar2009-08-271-1/+2
| | | | | | | | | | Task-number: 258404 Reviewed-by: Trust Me
| * fix compiler warnings on WindowsKent Hansen2009-08-271-2/+2
| | | | | | | | "*/ outside of comment"
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2780-488/+1621
| |\
| | * disable a few compiler warnings for qtscript/JavaScriptCore on WindowsKent Hansen2009-08-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | We do it when compiling JavaScriptCore as part of QtWebKit, so do it when compiling it as part of QtScript as well, otherwise the excess warning output is just ridiculous. Adopted from patch at https://bugs.webkit.org/show_bug.cgi?id=27709
| | * fix whacky behavior of QScriptValue::toString() for QVariantKent Hansen2009-08-272-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | For some types, an empty string is the correct and complete conversion of the type. If the result is an empty string, use QVariant::canConvert() to determine if that is indeed correct, before falling back to the "string-conversion-not-available" path.
| | * QNAM HTTP Code: Reduce connection count for SymbianMarkus Goetz2009-08-271-0/+4
| | | | | | | | | | | | | | | For mobile devices with high latency network it does not make sense to have 6 HTTP connections per host:port. Reduced it to 3.
| | * Fixed clipping bugs in QGLWidgets (very noticeable in sub-attaq).Samuel Rødal2009-08-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | When the paint engine used by QGLWidgets was the GL 2 paint engine the backing store assumed partial update support, which is not the case. We need to check for both QPaintEngine::OpenGL and QPaintEngine::OpenGL2. Reviewed-by: Trond
| | * Implement IME reconversion on windows.Prasanth Ullattil2009-08-273-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows IME supports reconversion of text. e.g. On a Japanese layout, up on pressing the HENKAN key a list of choices for the current word are shown in a popup. This patch adds that support to Qt. We will select the current word in the widget and the choices are shown as in the editing mode. Task-number:225588 Reviewed-by: axis
| | * Merge branch 'mergeRequest' into 4.6axis2009-08-272-74/+59
| | |\
| | | * move QFSFileEngine-related symbian code from qtemporaryfile to qfsfileengineRitt Konstantin2009-08-272-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i'm a garbage collector :) AutoTest: Passed RevBy: Miikka Heikkinen Signed-off-by: axis <qt-info@nokia.com>
| | | * remove symbianFileName stub once and for allRitt Konstantin2009-08-271-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | simply use ifdef to point which implementation should be compiled AutoTest: Passed Signed-off-by: axis <qt-info@nokia.com>
| | | * fixes and improvements made after s60 branch has been merged into masterRitt Konstantin2009-08-271-51/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * crash fixed ( d->filePath.at(0).isLetter() ) * warning removed in QFSFileEngine::copy ( unused param ) * minor optimisations * styling fixes * needless header include removed ( qregexp.h ) AutoTest: Passed Signed-off-by: axis <qt-info@nokia.com>
| | * | Doc: Widgets may ignore the role set with QWidget::setForegroundRole().Geir Vattekar2009-08-271-0/+8
| | | | | | | | | | | | | | | | | | | | Task-number: 182860 Reviewed-by: Trust Me
| | * | Make sure itemAt() reflects the visual order.Jan-Arve Sæther2009-08-275-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means it should respect the order that was defined with insertItem() and addItem(). Note that this is not strictly necessary (as now explicitly written in the docs for QGraphicsLayout::itemAt()), but commit 2ec56d158dc140f68efb45e2e0613f0e4026ddf6 broke the order and for people that relied on this that commit caused a regression. In addition, after commit 2ec56d158dc140f68efb45e2e0613f0e4026ddf6 it was not longer possible to query the "item at visual index". Thus, instead of adding another function (like QGGL::itemAt(int,int)) we make sure that itemAt() also returns the "item at visual index".
| | * | Doc fixes.Jan-Arve Sæther2009-08-271-9/+30
| | | |
| | * | Remove warning.Jan-Arve Sæther2009-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | It was initialized correctly though, just that some compilers could not see that.
| | * | Do not crash when double-clicking a tab in a QTabBar with movable tabsFrank Reininghaus2009-08-272-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if QTabBarPrivate's movingTab member is 0 before dereferencing it. This fixes a crash when double-clicking a tab. New unit test included. http://bugs.kde.org/show_bug.cgi?id=202767 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Merge-Request: 1337
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-08-274-1/+108
| | |\ \
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Keith Isdale2009-08-27244-2232/+4702
| | | |\ \
| | | * | | Add new manual test to check if CMYK encoded JPEG look the same whenKeith Isdale2009-08-273-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scaled New manual test for QImageReader and jpeg image loader plugin Task-number: 260192
| | * | | | Fix some missing and duplicated license headers.Jason McDonald2009-08-2719-80/+641
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | Doc: First review/editing of the QTouchEvent class documentation.David Boddie2009-08-271-27/+30
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | Doc: Fixed typo.David Boddie2009-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | Doc: Added a section to tidy things up. This document needs more work.David Boddie2009-08-261-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | Fix y orientation of pixmap brushes and pixmaptiles in gl1 engineGunnar Sletta2009-08-274-3525/+3370
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
* | | | | | Don't flip texture coords in texture brushes in accordance with new bindTextureGunnar Sletta2009-08-271-1/+0
| |_|_|/ / |/| | | | | | | | | | | | | | Reviewed-by: Trond
* | | | | compile on x11Gunnar Sletta2009-08-271-1/+1
| |/ / / |/| | |
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-2779-474/+2550
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * | | | Make QGLShader::ShaderType slightly more future proof byGunnar Sletta2009-08-272-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | making it into a bitmask. I'll add GeometryShader in the future Reviewed-by: Rhys Weatherley
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-08-272-35/+33
| |\ \ \ \
| | * | | | Fixes invalid use of staticsBill King2009-08-272-35/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple database connections could have differing ideas on the return value for defaultCase. The cost of the call is so minimal that caching is unnecessary, and static caching is very very wrong. Reviewed-by: Justin McPherson
| * | | | | API improvements for creating shaders from filesRhys Weatherley2009-08-272-52/+28
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to be possible to derive the shader type from the file extension, but this isn't very extensible and doesn't capture the usual extensions. Change it so that the shader type must be supplied explicitly. Also add the addShaderFromFile() function to QGLShaderProgram to provide a convenient short-cut for file-based shader creation. Reviewed-by: Sarah Smith
| * | | | Optimize permanentState/setPermanentStateAnders Bakken2009-08-261-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to use a QDataStream here. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | | | Remove bufferImage stuff from dfbwindowsurfaceAnders Bakken2009-08-262-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Neither grabWidget nor buffer is ever called from Qt and they're not public API Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | | | Implement QDirectFBScreen::surfaceForWidgetAnders Bakken2009-08-264-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow applications to get a pointer to the surface of the window surface for a given widget or a subsurface of the widget. This function ignores whether or not the widget is fully or partially obscured. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | | | ignore warning in autotestKent Hansen2009-08-261-0/+1
| | | | |
| * | | | make JIT construct objects of type QScriptObject, not JSC::JSObjectKent Hansen2009-08-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Commit 25e76959da84fe4c40f98cf32b7b8c69e5087681 changed it for the interpreter, this commit makes it work with the JIT enabled as well.
| * | | | warn if QScriptValue::setScriptClass() is called on incompatible objectKent Hansen2009-08-262-7/+29
| | | | |
| * | | | doc: Add Graphics Effect images.Bjørn Erik Nilsen2009-08-269-3/+17
| | | | |
| * | | | Use QScopedPointer instead of homegrown smartptrAnders Bakken2009-08-261-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QScopedPointer can take a custom cleanup handler we can use this instead of the original QDirectFBPointer. Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | | | Missing ducumentation in QAbstractItemModelOlivier Goffart2009-08-261-0/+34
| | | | |
| * | | | reverting the definition of WINVER and _WIN32_WINNT in qglobal.hJoerg Bornemann2009-08-264-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just caused too much problems and must be solved another way. In qfsfileengine_win.cpp we define FSCTL_GET_REPARSE_POINT and all of the other stuff that's needed for NTFS symlink support, if its not defined. This is the case if _WIN32_WINNT is less than 0x0500. All other changes in this commit are just reversions of commits that were done for the infamous qglobal.h change. Discussed with prasanth, tested by pulse.
| * | | | Fixed the bubbles.svg file after fixing some bugs in the SVG renderer.Trond Kjernåsen2009-08-263-29/+29
| |/ / / | | | | | | | | | | | | Reviewed-by: Kim
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2623-84/+1731
| |\ \ \
| | * | | Made the opengl/overpainting example work with the GL 2 engine.Trond Kjernåsen2009-08-262-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the GL 2 engine can't set/unset every single GL state that a user might possibly change, we have to make a rule that if something is changed from its default state, it needs to be reset before the GL 2 engine can draw correctly. Reviewed-by: Samuel
generated by cgit v0.12 at 2024-11-18 19:06:01 (GMT)