summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix tst_QBoxLayout::setGeometry failure on S60 3.xShane Kearns2009-10-271-1/+0
| | | | | | | | | | | | | The S60 style posts a LayoutRequest event when a widget is shown, so that it can draw the focus rectangle around the widget that has keyboard focus. Although lay2->setGeometry was working correctly, processEvents() caused the outer layout to be re-laid out (which expands the inner layout and QDial to fill the available space). The processEvents() call is not necessary for the test case, so it can be removed. Reviewed-by: Jan-Arve
* Update def files after Gesture API and Text Engine changesShane Kearns2009-10-272-7/+33
| | | | Reviewed-by: Trust Me
* Build fix for QtXmlPatterns' examples on SymbianFrans Englich2009-10-271-0/+4
| | | | | | This is the same workaround as Janne did for QtWebkit. Reviewed-by: Janne Koskinen
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-278-92/+59
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6axis2009-10-2731-51/+20727
| |\
| * | Fix integer overflow in string.remove len parameterMarkus Goetz2009-10-272-3/+12
| | | | | | | | | | | | | | | Task: 262677 Reviewed-by: joao
| * | Carbon: active window not restoredRichard Moe Gustavsen2009-10-271-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After closing a window we used to go through the list of kDocumentWindowClass windows to pick the next one to pop to front. This patch will search the kMoveableWindowClass list of windows first, and as such, pop to front any modal window first Rev-By: MortenS
| * | Implement support for wheel delta with finer resolution than 15 deg.Richard Moe Gustavsen2009-10-275-87/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment, Qt, in many places, does not really understand that a mouse wheel, or touch pad, might operate on a much higher granularity than 15 degrees (that is, a delta of 120). This is clear disadvantage on mac, since the mighty mouse, and track pad, got a resolution that is close to 1 degree. This is called pixel scrolling. This patch first and formost changes the implementation of QAbstractSlider::wheelEvent to _really_ understand what to do when delta is less than 120. Rather than accumulate delta until 120 is reached, then scroll with a value equal to: offset * step * QApplication::wheelScrollLines (default = 3), we multiply offset directly, before waiting for 120. This means that event tough offset is below 120, multiplying it with wheelScrollLines and step will very often give a value over 120, menaing we can scroll much earlier and _much more_ fined grained. This also fixes some auto tests that was ifdeffed out because of specialised mac code written inside this function from before. (NB: we still plan to introduce a new event for pixel scrolling, perhaps for Qt-4.7) Rev-By: Andreas Rev-By: denis
* | | Draw QSplitter in QS60StyleSami Merilä2009-10-271-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously QS60Style did not draw CE_Splitter control at all. With this change, the style draws it when user presses the splitter down to make a drag. Since native side does not have splitter at all, we are drawing splitter rect as partially transparent rounded rect with QPalette::Light (which has been picked from active theme). Task-number: QT-686 Reviewed-by: Shane Kearns
* | | Fixed 'illegal empty declaration' warning from XmlPatters.Janne Anttila2009-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The following warning was reported by MWCCSYM2 (Symbian emulator compiler): \src\xmlpatterns\api\qxmlquery.h:77: warning: illegal empty declaration Reviewed-by: TrustMe
* | | Cleanup softkeymanager keyedactions hash when QAction is being deleted.Janne Anttila2009-10-272-1/+9
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Use PM_SplitterWidth in QS60StyleSami Merilä2009-10-274-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | Updated pixel metrics values from latest S60 layouts. Also, updated pixel metrics harvester to collect pixel metric for QSplitter. Task-number: QT-686 Reviewed-by: Shane Kearns
* | | Enable webkit and xmlpatterns by default on Symbian.Frans Englich2009-10-272-2/+2
| | | | | | | | | | | | Suggested by Lars, OK'd by Jason, Kristian and Shane.
* | | Compile on Symbian winscw.Frans Englich2009-10-272-67/+66
| | | | | | | | | | | | | | | | | | | | | Patch by Martin Jones. Malformed in codepaster so was manually applied. Builds with public 5th SDK. The compiler workaround was documented. Reviewed-by: Frans Englich
* | | Temporary fix for FEP crash with input masked QLineEditsMiikka Heikkinen2009-10-271-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLineEdits with input masks report the cursor position relative to displayed text via inputMethodQuery(), but the text returned is the actual text of the control, which can differ from displayed text, causing mismatch between FEP display and control display. To properly fix this we would need to know the displayText of QLineEdits instead of just the text, which on itself should be a trivial change. The difficulties start when we need to commit the changes back to the QLineEdit, which would have to be somehow able to handle displayText, too. Task made to fix this properly: QTBUG-5050 Task-number: QTBUG-4892 Reviewed-by: axis
* | | Switched setWindowIcon_sys to use QPixmpa::toSymbianCFbsBitmap in S60.Janne Anttila2009-10-271-68/+4
| |/ |/| | | | | | | | | | | | | | | | | | | There were TODOs in code to remove the temporary solution for creating native CFbsBitmap out of QPixmap. Now when QPixmpa has native backed and it provides toSymbianCFbsBitmap, it it preferred to use toSymbianCFbsBitmap since in best case it can only duplicate the bitmap handle instead of copying the data. Task-number: QTBUG-4948 Reviewed-by: Jani Hautakangas
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-2789-634/+1638
|\ \ | |/
| * Fix OpenVG window composition when opacity != 1Rhys Weatherley2009-10-271-20/+16
| | | | | | | | | | Task-number: QT-2322 Reviewed-by: Sarah Smith
| * Use vgClear() to clear the background during screen compositing.Rhys Weatherley2009-10-271-18/+46
| | | | | | | | | | | | | | | | This fixes an "off by 1" bug in screen compositing with OpenVG that left lines all over the background when windows were moved. Task-number: QT-2322 Reviewed-by: Sarah Smith
| * Fixes Oracle batchExec using strings as out params.Bill King2009-10-272-2/+63
| | | | | | | | | | | | reserve() affects capacity(), not length(). Task-number: QTBUG-551
| * Autotest: fix building tst_qsqlquery.Thiago Macieira2009-10-261-1/+1
| | | | | | | | | | | | 'का' is not valid, since it encodes to more than 1 byte. Reviewed-by: Trust Me
| * Revert "Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by Iain"Iain2009-10-261-13/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit f4abf627a8d097e095022d2709718a681b54bd7e. DEF file was unconditionally enabled for Webkit, ignoring setting in qtbase.pri, which was supposed to be the global place to enable/disable DEF file usage. Remove this workaround since we still haven't got DEF files switched on by default. (cherry picked from commit 3b7f570e6f296ef0a5c9c581ed06cb19986164a0)
| * Doc: Added internal or hidden placeholder documentation.David Boddie2009-10-261-0/+17
| | | | | | | | | | Reviewed-by: Trust Me To-be-completed-by: QtWebKit developers
| * Doc: Fixed qdoc warnings.David Boddie2009-10-263-7/+3
| | | | | | | | Reviewed-by: Trust Me
| * Doc: Fixed qdoc warnings.David Boddie2009-10-261-2/+21
| | | | | | | | Reviewed-by: Trust Me
| * Doc: Fixed whitespace issue.David Boddie2009-10-261-4/+3
| | | | | | | | Reviewed-by: Trust Me
| * QSslSocket: Add \reimp to the socket option functionsMarkus Goetz2009-10-261-0/+6
| | | | | | | | Reviewed-by: Thiago
| * tst_qtcpsocket: Increased some of the timeouts to increase stabilityMarkus Goetz2009-10-261-7/+7
| | | | | | | | Reviewed-by: TrustMe
| * QPixmap::loadFromData: Do not crash on empty/invalid data/lengthMarkus Goetz2009-10-262-0/+24
| | | | | | | | | | Task-number: 262636 Reviewed-by: gunnar
| * Implement symbol hiding for JSC's JIT functions.Thiago Macieira2009-10-261-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions are implemented directly in assembly, so they need the proper directives to enable/disable visibility. On ELF systems, it's .hidden, whereas on Mach-O systems (Mac) it's .private_extern. On Windows, it's not necessary since you have to explicitly export. I also implemented the AIX idiom, though it's unlikely anyone will implement AIX/POWER JIT. That leaves only HP-UX on PA-RISC unimplemented, from the platforms that Qt supports. It's also unlikely that we'll imlpement JIT for it. Reviewed-by: Kent Hansen (this commit was 26d0990c66068bfc92a2ec77512b26d4a0c11b02, but was lost during a WebKit update)
| * Fix linking of WebKit on Linux 32-bit.Thiago Macieira2009-10-261-1/+2
| | | | | | | | | | | | It was missing the ".text" directive at the top of the file, indicating that code would follow. Without it, the assembler created "NOTYPE" symbols, which would result in linker errors.
| * Fixed typo in configure usage (superfluous hyphen).Erik Verbruggen2009-10-261-1/+1
| | | | | | | | Reviewed-by: Thiago Macieira
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-261500-16350/+43625
| |\
| | * Suppress warnings in QtOpenGL codeRhys Weatherley2009-10-263-1/+5
| | |
| | * Suppress warnings under OpenGL/ES 2.0 in QGLShaderProgramRhys Weatherley2009-10-261-0/+55
| | |
| | * Fix OpenGL/ES 2.0 bug in previous QGLShaderProgram check-inRhys Weatherley2009-10-261-1/+1
| | |
| | * Use QObjectPrivate within QGLShaderPrivate and QGLShaderProgramPrivateRhys Weatherley2009-10-262-47/+134
| | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * Optimize concatenation of partial shadersRhys Weatherley2009-10-262-30/+95
| | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * Fix ifdef around QMatrix4x4::rotate(QQuaternion)Rhys Weatherley2009-10-261-1/+1
| | | | | | | | | | | | Reviewed-by: trustme
| | * Optimize QGraphicsRotation's use of QMatrix4x4Rhys Weatherley2009-10-264-6/+179
| | | | | | | | | | | | | | | | | | | | | | | | Previous code was creating a full 3D rotation matrix and then projecting back to 2D. This change combines the two steps into one to avoid calculating matrix components that will be dropped. Reviewed-by: Sarah Smith
| | * Make compile on X11 systems where qreal == floatRhys Weatherley2009-10-261-1/+1
| | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * Fix a crash in shutdown of QGraphicsEffectRhys Weatherley2009-10-251-1/+1
| | | | | | | | | | | | Reviewed-by: trustme
| | * Issue a warning if bindAttributeLocation() is used after shaders linkedRhys Weatherley2009-10-251-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Attribute locations must be bound before a shader program is linked according to the GLSL specification. Issue a warning to the user if they do it in the wrong order, which should help to isolate hard to find bugs much quicker. Reviewed-by: trustme
| | * Add an extra overload for QMatrix4x4::toTransform()Rhys Weatherley2009-10-254-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 100afe8d fixed a bug in QGraphicsRotation related to when the "distance to plane" projection needed to be performed. As a side effect it made the toTransform() API not do the expected thing when the function is called with no argument. This change makes the default no-argument version of toTransform() do the simple "drop row 3 and column 3" orthographic transformation that normal users of the class expect, and adds a new overload for the "distance to plane" projection case for the special case. Reviewed-by: trustme
| | * Merge branch '4.5' into 4.6Thiago Macieira2009-10-233-29/+6
| | |\
| | | * QWidget painting regression on Windows.Bjørn Erik Nilsen2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem occurred on Windows due to a call to repaint() on a top-level window from setDisabledStyle() in qwidget.cpp. This function is called whenever a window is blocking. In this particular case the children of the repainted window are opaque, and should therefore not be repainted, which also means that the top-level have to subtract the region of the opaque children when filling the background. This region is cached, and the problem was that the cached region was wrong. It was wrong because it was not invalidated properly. Task: QTBUG-4245 Reviewed-by: Paul
| | | * QWindowsMobileStyle::drawPrimitive(PE_Frame) background color fixedJoerg Bornemann2009-10-221-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The background color of PE_Frame was palette().light() and has been changed to use palette().background() now. This fixes the autotest tst_QStyleSheetStyle::task188195_baseBackground for Windows mobile. Reviewed-by: thartman
| | | * move default QAbstractButton font setup on Win mobile to QApplicationJoerg Bornemann2009-10-222-24/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original approach of modifying the font for QAbstractButtons in QWindowsMobileStyle::polish broke the autotest tst_qstylesheetstyle::fontPropagation. Reviewed-by: thartman
| | * | Compile on QWSAnders Bakken2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 04d18b38c38c5ff623b30366ea08d56128b9b7d0 Qt didn't compile for QWS. Will email original committer to verify that original intent is maintained. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * | Add cross compiling pkg-config disabled warningDonald Carr2009-10-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have historically silently disabled pkg-config when cross compiling in order to avoid host pkg-config contamination of the target build. pkg-config files are present on many embedded targets, and make the correct detection/configuration of dependencies far more convenient for the developer. It is therefor valuable to advertise that pkg-config functionality is available but disabled barring direct involvement on their parts, rather than silently disabling it. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
generated by cgit v0.12 at 2025-01-23 17:45:13 (GMT)