summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed: Variable res goes out of scope but is accessed later via pointerMiikka Heikkinen2009-10-291-3/+3
| | | | | | | In qdatetime UTC conversion functions, variable res was declared in incorrect scope and went out of scope too soon in Symbian. Reviewed-by: Janne Koskinen
* Fix for softkey visibility when dialog launched from fullscreen widget.Janne Anttila2009-10-291-0/+1
| | | | | | | | | Softkeys should be always the topmost window in order to be visible. For example when QMessageBox is launched from fullscreen window, we need to make sure that softkey is located on top of window tree. Task-number: QTBUG-4953 Reviewed-by: Jason Barron
* Removed mentions about certain flags being temporary for SymbianMiikka Heikkinen2009-10-291-13/+7
| | | | | | | | | | In configure app, some QT_NO_* flags were indicated to be temporary and should be removed once Qt for Symbian is out, but it looks like at least some of them will be there for longer haul, so removed mentions of temporary nature of these flags. Task-number: QTBUG-4744 Reviewed-by: Janne Anttila
* Fix QDateTime on S60 3.1Shane Kearns2009-10-292-5/+98
| | | | | | | | | | | | | S60 3.1 plugin returned empty strings for the unsupported APIs Since these APIs are needed for the most common use case of converting a QDateTime to a QString using the local format, I have implemented an emulation of the missing APIs using older APIs that are supported. Updated the autotest so it does some sanity checking on the result of local date/time conversion - it would pass instead of fail if the string was garbage before. Reviewed-by: Aleksandar Sasha Babic
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-2941-626/+926
|\
| * doc typoWarwick Allison2009-10-291-1/+1
| |
| * Change all valid Task-Tracker references to bugreports.qt.nokia.com reference.Warwick Allison2009-10-294-4/+4
| |
| * Remove shader/program binary support for nowRhys Weatherley2009-10-282-222/+0
| | | | | | | | | | | | | | | | | | | | After API review discussions, it was decided to remove shader binary support until we have a better handle on what we need. Applications can directly load shader binaries on the shaderId() using glShaderBinary() directly so they aren't prevented from using the feature. Reviewed-by: trustme
| * Remove QVGEGLWindowSurfaceQImage from QtOpenVGRhys Weatherley2009-10-283-80/+2
| | | | | | | | | | | | | | | | Rendering into a QImage as a window backing store isn't very efficient and isn't needed by any of our current platforms. If a specific graphics system needs it in the future, it can implement it directly. Reviewed-by: trustme
| * make magic comment parsing stricterOswald Buddenhagen2009-10-281-9/+9
| | | | | | | | | | | | there must be a space after the //: and similar comments, otherwise harmless comments of the sort of //====== foo here ===== will be parsed as message ids, etc.
| * QSslError: Actually make strings show up in the ts fileMarkus Goetz2009-10-281-29/+28
| | | | | | | | | | | | | | | | | | I suspect because of missing quotation marks those strings were not showing up. Also, wrapping QT_TRANSLATE_NOOP inside a tr() call makes no sense. Also changed the class from QObject to QSslSocket. Task-number: QTBUG-5059 Reviewed-by: ossi
| * QNativeSocketEngine: Actually use translationsMarkus Goetz2009-10-281-26/+26
| | | | | | | | | | Task-number: QTBUG-4984 Reviewed-by: Thiago
| * Delete the tst_QWebFrame::setHtmlWithBaseURL test until its fixedJocelyn Turcotte2009-10-281-23/+0
| | | | | | | | | | | | upstream. Reviewed-by: TrustMe
| * Greatly improve the performance of obtaining a state's transitionsKent Hansen2009-10-282-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transitions are children of their source state. We use QObject::children() and qobject_cast() each child to a QAbstractTransition to see if it is indeed a transition. However, calling qobject_cast() is very expensive. This commit introduces a cached list of transitions. The list is invalidated after a child object has been added or removed. In the typical case we expect the object hierarchy to remain fairly constant once the state machine has been started (states, child states and transitions are usually "static"), in other words the cached list is not likely to be invalidated much. Obtaining a state's transitions needs to be as fast as possible because it's in the critical path of the state machine algorithm. Reviewed-by: Eskil Abrahamsen Blomfeldt
| * Make Qt on QNX compile againHarald Fernengel2009-10-282-3/+3
| | | | | | | | Fix a typo, update the tmp path to match current qws behavior.
| * Say hello to QScriptProgram :-)Kent Hansen2009-10-2810-59/+763
| | | | | | | | | | | | | | | | | | | | | | QScriptProgram encapsulates a Qt Script program (AKA a script). It retains the compiled representation of the script, so that repeated evaluation of the same script becomes faster. An overload of QScriptEngine::evaluate() that takes a QScriptProgram has been added. Reviewed-by: Olivier Goffart
| * Fix namespace buildRichard Moe Gustavsen2009-10-282-0/+6
| | | | | | | | | | | | Looks like a couple of files missed the namespace macro... Rev-By: gunnar
| * Fix namespace build.Richard Moe Gustavsen2009-10-281-3/+2
| | | | | | | | | | | | | | | | | | At least Qt fails building with a namespace on Mac without this change. What happends is that inserting a namespace before the includes, will add the namespace twize if the included files also inserts the namespace. Rev-By: Alexis
| * qdoc: Update QGraphicsTransform docs after changes to QGraphicsRotationRhys Weatherley2009-10-281-0/+3
| | | | | | | | Reviewed-by: Michael Brasser
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Peter Yard2009-10-2850-341/+20957
| |\
| | * Add 800x480 to the qvfb configuration dialogRhys Weatherley2009-10-282-1/+11
| | | | | | | | | | | | | | | | | | | | | 800x480 is an increasingly common screen size on embedded devices, and specifying it via Custom sizes is annoying. Reviewed-by: Sarah Smith
| | * Doc: Fixed qdoc warning.David Boddie2009-10-271-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Doc: Remove unused file.David Boddie2009-10-271-149/+0
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Guard shadow builds against stale qconfig.cppDonald Carr2009-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qconfig.cpp is generated immediately after accepting the licensing agreement, and contains all the fixed paths qt uses. If this file is present in a source dir used by shadow builds, this qconfig.cpp will take precedence over the shadow builds qconfig.cpp and hence impose its paths throughout the shadow built Qt. This change adds qconfig.cpp to the list of generated files to guard against existing in the source directory when performing a shadow build. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * Fix for Gtk+ toolbuttons and sliders.Robert Griebl2009-10-273-7/+34
| | | | | | | | | | | | | | | | | | Maemo5 looks very weird without these patches. Reviewed-By: jbache
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Peter Yard2009-10-2724-119/+589
| |\ \
| * | | Add documentation on RPATH defines.Peter Yard2009-10-271-0/+15
| | | |
* | | | Fixed crash/drawing artifacts on rotation change on Symbian.axis2009-10-281-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On every beginDataAccess on the pixmap data, we checked the value of the pointer to the bits and only updated the image if the pointer had changed. However, we didn't take into account that the pointer could be the same, even though the dimensions were different, since malloc() could return the same memory area. This would lead to painting into an image that had the wrong dimensions, which again led to either crashes or image shearing. Fixed by checking the dimensions before deciding to update the image. Task: QTBUG-4815 RevBy: Jason Barron
* | | | Increased block size for file IO in Symbian.Miikka Heikkinen2009-10-281-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each read requires costly IPC call to Symbian file server, so reading and writing large files has lot of unnecessary overhead when using 4k block size. Increased the block size to 16k, which is what QIODevice will request at maximum. This speeds up reading large files up to 10%. Also included are some unnecessary whitespace removals. Task-number: QT-2347 Reviewed-by: axis
* | | | Fix EColor16M conversion in QPixmap::fromSymbianCFbsBitmap()Jani Hautakangas2009-10-282-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | EColor16M is in BGR format so after conversion to QImage RGB values needs to be swapped. Reviewed-by: jbarron
* | | | Bad line ending in cabbff076f40eeeb56beb53220a40f124a2e0215Shane Kearns2009-10-281-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Shane Kearns2009-10-282-0/+6
|\ \ \ \
| * | | | Enable QtXmlPatterns module in qt package and assign an UID for it.Liang QI2009-10-282-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable QtXmlPatterns module in qt package and assign an UID for it. RevBy: Miikka Heikkinen RevBy: Jason Barron
* | | | | Change deployment of SQLite to check for stub SIS fileShane Kearns2009-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is less wrong than searching for a file name on specific drives. Correct solution is to use an embedded SIS file dependency, for that we need to get a symbian-signed sis file from the symbian OS team. Reviewed-by: Miikka Heikkinen
* | | | | Fix to 8e0fbc2caa3edefb78d6667721235b783bc1a850Shane Kearns2009-10-281-0/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version of the fix will set the def file only if defblock is enabled in qbase.pri. That means that def files don't get turned on for webkit but not for the whole project (avoids build failures in the continuous integration system when other teams change the exported symbols) Reviewed-by: Jason Barron
* | | | 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