summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Separated "make run" and "make runonphone" targetsMiikka Heikkinen2010-01-112-12/+23
| | | | | Reviewed-by: axis (cherry picked from commit e2f2765b52508515874edea7015c01eb95ff89be)
* Fixed "run" makefile target documentation for SymbianMiikka Heikkinen2010-01-112-1/+15
| | | | | | | | "run" target no longer is just for running emulator targets. Also added TRK for optional requirements. Reviewed-by: axis (cherry picked from commit 1ae7c8d8f549cadda4780835d85235085cc5583c)
* Deal with test cases that crash or hangShane Kearns2010-01-116-33/+183
| | | | | | | | | | | | | | | Added an optional timeout to runonphone - the application will be killed after this time. Used when autotesting unattended, as some tests can hang. Handled the just in time debug halting the application when it is about to crash, by terminating the application. In future, we could capture a call stack or something here. Also added quiet/verbose options to control the amount of output from runonphone. Reviewed-by: Janne Koskinen (cherry picked from commit 0e94349de0b602f1b6af747b66ef03b22133cc3a)
* Enable building with MSVC2008Shane Kearns2010-01-113-11/+7
| | | | | | | | | | | Removed the alternate implementation of the registry reading, although the new API is simpler, the old XP method is not deprecated. Added an extra library that is needed according to API documentation, but is omittable on MinGW. Also gave a better error message when serial port detection fails. Reviewed-by: Miikka Heikkinen (cherry picked from commit 32419380bdd11e7db401fd37a840e0ec4f5b6845)
* Removed QtWebkit.dll from Qt.sis in Symbian buildsMiikka Heikkinen2010-01-113-4/+12
| | | | | | | | | | | | | | In preparation for future removal of Webkit from Qt, Qt.sis no longer contains QtWebkit.dll. All projects that have webkit dependency now automatically also add dependency qtwebkit.sis into their .pkg files. To create qtwebkit.sis, run "make sis" in src\3rdparty\webkit\WebCore directory. Task-number: QTBUG-6841 Reviewed-by: Simon Hausmann Reviewed-by: Janne Koskinen (cherry picked from commit 337931b28cb1157512ae2b6ab67ceaaf63bf1e48)
* Added mention of Symbian binary packages to INSTALL fileMiikka Heikkinen2010-01-111-0/+4
| | | | | | Task-number: QTBUG-6162 Reviewed-by: TrustMe (cherry picked from commit 1f8fa41e78b4174ab64953dd80a1d562b0afc5aa)
* Added a flag to avoid construction of application panes.axis2010-01-118-6/+172
| | | | | | | | | | This is purely an optimization for fullscreen-only apps. Task: QTBUG-6098 RevBy: Jason Barron RevBy: mread AutoTest: Included (cherry picked from commit 4a84b272459160780529f654e6aee3abf8569b51)
* Fix for QTBUG-5870 QGraphicsProxyWidget does not show children onJani Hautakangas2010-01-111-3/+10
| | | | | | | | | | Symbian. QS60PaintEngine returned wrong device in QPaintEngine::paintDevice(). Task-number: QTBUG-5870 Reviewed-by: Jason Barron (cherry picked from commit 4378b168ad289e1acbde9580b750ce04b51260c3)
* Symbian: More i18n strings work.Frans Englich2010-01-112-34/+34
| | | | | | | | | * Consistently capitalize error sentences * Simplify & fix code/documentation. Task-number: QTBUG-4994 Reviewed-by: TrustMe (cherry picked from commit db782f7ab22241d8161190b95c41af4d56c05b82)
* Fixed bug which caused Phonon backend error messages to be suppressedGareth Stockwell2010-01-112-6/+7
| | | | | | | | | | | | When the mediaplayer receives a state change into the ErrorState, it calls pause() on the media object. Previously, this caused the backend to transition into PausedState. When the mediaplayer subsequently called errorString() to retrieve the error message, an empty string was returned because the backend was no longer in the ErrorState. Task-number: QTBUG-4994 Reviewed-by: trustme (cherry picked from commit dfa9343cc1e634eebdb0f3a2cf931ada9829ae6b)
* Added error strings to Phonon MMF backendGareth Stockwell2010-01-118-51/+170
| | | | | | | | | | | Note that changing Utils from a namespace into a class, and then using Q_DECLARE_TR_FUNCTIONS in the class declaration, was necessary in order to be able to call tr(...) from the implementation of Utils::symbianErrorToString. Task-number: QTBUG-4994 Reviewed-by: Oswald Buddenhagen (cherry picked from commit 3ed427637dd76da371174e14b0f7f2a15801fcac)
* Deploy sqlite3.sis instead of sqlite3.dll in SymbianMiikka Heikkinen2010-01-112-4/+3
| | | | | | Task-number: QTBUG-4879 Reviewed-by: Shane Kearns (cherry picked from commit 784374ac949ecf2fdc6895908e1e4dfe938931b8)
* Make sure the rect in QPixmap::copy() doesn't exceed the boundingRect.Gunnar Sletta2010-01-081-1/+3
| | | | | | Task: http://bugreports.qt.nokia.com/browse/QTBUG-6303 Reviewed-by: Samuel (cherry picked from commit 1484008e831a6b18272babb17992c4de686da045)
* Revert "QStyleSheetStyle: Fixed some text croped when having padding with ↵Olivier Goffart2010-01-082-58/+1
| | | | | | | | | | | native border." This reverts commit 6e90192b599cee9b903177a0978198326f667613. his change the behaviour a little bit. It is better to wait for Qt 4.7 Reviewed-by: jbache (cherry picked from commit 092f2014cf81d9f58670ede7d381022dd6903cbb)
* Changelog: Added Designer/uic entries for 4.6.1Friedemann Kleint2010-01-081-1/+8
| | | | (cherry picked from commit 547e117e7463db85651d910d5a627806388b9afc)
* Fix performance regression in _q_polishItems.Alexis Menard2010-01-083-6/+29
| | | | | | | | | | | | | | | QSet is a hash internally, using Iterator::begin while erasing elements inside the set might create holes and then the complexity increase. We now use the return value of erase (the next element) so the complexity is linear. For those who create/delete item in the polish event (BAD), _q_polishItem might be slower than the normal call. Task-number:QTBUG-6958 Reviewed-by:olivier (cherry picked from commit 6026436f0de6020252410c021e0745a22599b159)
* Avoid a deep copy of QImage::bits() in the png writerRhys Weatherley2010-01-081-1/+1
| | | | | | Task-number: QTBUG-7161 Reviewed-by: Daniel Pope (cherry picked from commit 80e6ea3e871fa9f0e5a21d48ad893d4ec59c5c1c)
* Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"Tom Cooksey2010-01-073-73/+3
| | | | | | | | | | | | We don't add new public methods in patch releases. This reverts commit 2b4d3391fd922dfc5ac28815bbd5f36c4041b658. This patch also fixes the paint engine to use glUniformMatrix3fv directly now it has been removed from 4.6. It is a 3 line change. Reviewed-By: Samuel (cherry picked from commit b1327abb777ff3ee7ae32690442ca1250f536054)
* Introduce new "snapToPixelGrid" flag to GL2 engine for drawTextTom Cooksey2010-01-072-5/+44
| | | | | | | | | | | | | When we're rendering text, the glyphs need to be aligned to the pixel grid otherwise we get strange artifacts. Normally text is drawn at integer coordinates, however it is still possible to have a transform which translates by a non-integer offset. This patch adds a flag to the engine which can be used to snap any translate to the pixel grid. Task-number: QTBUG-7094 Reviewed-By: Kim (cherry picked from commit 1e7922262c29ba29a70226cf8894645f46df3ca2)
* doc: Clarified which values were added in Qt 4.4.Martin Smith2010-01-071-8/+11
| | | | | Task-number: QTBUG-7118 (cherry picked from commit c08789f4540ac934ac4a20feaac205837fb0cf6f)
* QBoxLayout::setGeometry would not respect the widget min/max widthGabriel de Dietrich2010-01-072-2/+31
| | | | | | | | | | | When calling heightforWidth after a geometry change, the width actually used could be outside the widget's width bounds. The height could then be smaller than needed to fit the widget's contents resulting in a clipped widget being drawn. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-7103 (cherry picked from commit 94759a0ed565b21c8dbfb4b12bfe6064f156b410)
* doc: Removed a const from a declaration in the example.Martin Smith2010-01-071-1/+1
| | | | | Task-number: QTBUG-7092 (cherry picked from commit 0e4c54809a8195a199d85b143e042b0f5e53fb4c)
* Set serial number in QX11PixmapData::transformedAnders Bakken2010-01-071-0/+2
| | | | | | | | QX11PixmapData::transformed initializes a new QX11PixmapData object but doesn't set its serial number. Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit eb94abb952114e826e02ba4562d9048e77f46644)
* Reset the OpenVG scissor after a native painting call-outRhys Weatherley2010-01-071-2/+11
| | | | | | Task-number: QTBUG-7051 Reviewed-by: Daniel Pope (cherry picked from commit fbccab463a8bd77d66adb9f96a67037f73f0019d)
* Fix background brush for character format when writing to ODF document.Pierre Rossi2010-01-072-1/+12
| | | | | | Task-number: QTBUG-7047 Reviewed-by: Benjamin Poulain (cherry picked from commit 51c4571caf5d5ffb2545106df47d7c399b3e228b)
* Avoid deep QImage copies in the OpenVG paint engineRhys Weatherley2010-01-072-9/+12
| | | | | | Task-number: QTBUG-7015 Reviewed-by: Daniel Pope (cherry picked from commit b0e7ef2aa62a123b51920b8f0a08af07a9cd9d09)
* doc: Clarified next and previous activation order.Martin Smith2010-01-071-8/+8
| | | | | Task-number: QTBUG-6992 (cherry picked from commit 049f65b4d07587e26c69602e6e59682e82948bd2)
* Fixed a copy-paste error in QRasterPixmapData::metric().Trond Kjernåsen2010-01-071-1/+1
| | | | | | | | | Calling metric() to get the device height in mm of a pixmap when using the raster engine would actually return the width.. Task-number: QTBUG-6985 Reviewed-by: Carlos Duclos (cherry picked from commit 4bd7e6930fcd9e04696aa5426691cd90ba383a32)
* doc: Fixed typo.Martin Smith2010-01-071-1/+1
| | | | | Task-number: QTBUG-6978 (cherry picked from commit fee4ec0c8f507fae4f6795f43dca1333f46c9922)
* Fixes painting artifacts when using CacheBackground in a QGraphicsView.Yoann Lopes2010-01-071-1/+2
| | | | | | | | | | | The problem was that when the background cache was invalidated, it was entirely recreated but only the exposed area of the view was repainted in it, causing the cache to be partly empty in some cases. Now the background cache is always fully repainted when it is invalidated. Task-number: QTBUG-6935 Reviewed-by: ogoffart (cherry picked from commit 2600fd42117913b427d07e510724b0ea5e355205)
* doc: Replaced usses of rootState() with state machine pointer.Martin Smith2010-01-071-2/+2
| | | | | | | The root state of a QStateMachine is now the state machine itself. Task-number: QTBUG-6907 (cherry picked from commit 553e0cafa578ece64c07afa11571eca4c7b9444c)
* Fixes crash when widget with WA_StaticContents child become toplevel.Olivier Goffart2010-01-072-7/+34
| | | | | | | | | | | | | Happens for example if a DockWidget is undocked and has a child whith the WA_StaticContents attribute. The parent does not change (so newParent is false) but still, the top level widget change. So staticWidget need to be moved to the new backingstore. Reviewed-by: Benjamin Poulain Task-number: QTBUG-6883 (cherry picked from commit 03baad51d584778a99f4b393232ccc1312db3391)
* BitsPerSample should default to 1 in TIFF files.Rhys Weatherley2010-01-071-4/+3
| | | | | | Task-number: QTBUG-6870 Reviewed-by: Lorn Potter (cherry picked from commit f019f3cf807e3c804bba3ef5598ea69adbb39e8b)
* doc: Added note explaining grabMouse() for Cocoa and Carbon.Martin Smith2010-01-071-4/+10
| | | | | Task-number: QTBUG-6810 (cherry picked from commit 190f45bcc7383bdc68a904e7dd5780372d00afba)
* doc: Added some missing macro descriptions.Martin Smith2010-01-071-4/+27
| | | | | Task-number: QTBUG-6769 (cherry picked from commit 94c2fce09c34b629a6fcb5a9576c4646a1ac24a8)
* doc: Clarified that the scene owns its items and destroys them.Martin Smith2010-01-071-11/+17
| | | | | Task-number: QTBUG-6637 (cherry picked from commit 9cdeb6ca14713891a14f24e97adb59b0d3b682fd)
* doc: Clarified that .lnk files are System files on Windows.Martin Smith2010-01-071-3/+4
| | | | | Task-number: QTBUG-6615 (cherry picked from commit 9bb45b19789910aff5e2a972a1ced758814fac31)
* Implement QScript::QObjectDelegate::getOwnPropertyDescriptorOlivier Goffart2010-01-074-1/+164
| | | | | | | | This is needed for the fix for QTBUG-5749 that follow Reviewed-by: Kent Hansen Task-number: QTBUG-5749 (cherry picked from commit d14ac9914753220e54f3b5cd94d122325d499776)
* QScript: Lookup the native setter from the prototypeOlivier Goffart2010-01-071-1/+9
| | | | | | | | | | | | | | | | | Usefull if we have 'native' properties with setter in a prototype This happen if you use a QObject wrapper as a prototype. Use getPropertyDescriptor that look up the prototype in order to know if we have a setter. Note that we cannot relly on PropertDescriptor::isAccessorDescriptor as the Getter or Setter attributes are not necesserly updated correctly when updating properties. (See the workaround QScriptValuePrivate::propertyFlags, and tst_QScriptValue::getSetProperty with object7) Task-number: QTBUG-5749 (also need the previous patch) Reviewed-by: Kent Hansen (cherry picked from commit e715a7f4cfad454b9c966fa2938cbe9a92ce49fb)
* Fixed QGLWidget::renderText().Trond Kjernaasen2010-01-073-109/+13
| | | | | | | | | | | | Fall back and use the GL 1 engine for the renderText() functions. Getting it to work with the GL 2 engine is a futile effort. Making it work with renderPixmap() in the GL 2 engine is not possible at all, since software contexts in general do not support shader programs. Task-number: QTBUG-5002, QTBUG-6931 Reviewed-by: Kim (cherry picked from commit 5394052c422f7087263ad6dc6d6a4448b4c4afba)
* Fix QT_NO_CONTEXTMENUKent Hansen2010-01-061-0/+2
| | | | | Task-number: QTBUG-6474 (cherry picked from commit e8b3defc466fff9110ee00b6e730d405cde52abc)
* doc: Added an explanatory \note about the table being sorted.Martin Smith2010-01-061-2/+12
| | | | | Task-number: QTBUG-5046 (cherry picked from commit 65a0c8cc6d2c13cfb2cef22e8a23f4e3050fde25)
* Updated sis file names and related content in Symbian installation docsMiikka Heikkinen2010-01-062-12/+24
| | | | | | Task-number: QTBUG-6348 Reviewed-by: Janne Koskinen (cherry picked from commit 44f7b73940c67b8e81f52dfc6370453ff07d3aa2)
* Fixed Symbian application deployment instructionsMiikka Heikkinen2010-01-062-7/+3
| | | | | | | | Obsolete sis files were referenced. Task-number: QTBUG-6601 Reviewed-by: Janne Koskinen (cherry picked from commit 66275bc468339ec2599ba660b728304858e30b39)
* Update license headers to release versionJason McDonald2010-01-068785-114335/+114337
| | | | Reviewed-by: Trust Me
* Remove the need to know the service owner when adding/removing signal rules.Thiago Macieira2010-01-064-34/+21
| | | | | | Task-number: QTBUG-5979 Reviewed-By: TrustMe (cherry picked from commit 06bdf48e9194d73075041efecde5c70a144d6927)
* Use the watched service name list in matching incoming signals too.Thiago Macieira2010-01-061-2/+8
| | | | | | Task-number: QTBUG-5979 Reviewed-By: TrustMe (cherry picked from commit 200413f08334574108fdb07efaa7648f90209a8f)
* Change the QtDBus watched service list to a map to its owner.Thiago Macieira2010-01-062-17/+48
| | | | | | | | | | | | | | Instead of simply counting how many times we're watching a service, also map a service to its owner. This allows us to provide a faster, cached GetNameOwner too. Technically, this could mean that a service that is started in-between event loops could remain invalid for a longer period of time. I'm not sure this is an issue -- will need some testing in KDE. Task-number: QTBUG-5979 Reviewed-By: TrustMe (cherry picked from commit 988decb610ec5e12380c60204878a0b9e2aaeb01)
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-2819-227/+470
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QUrl::toEncoded() fix for the case of "password, but no username". Fix tst_QFileInfo::isHidden_data on Windows QStyleSheetStyle: Fixed some text croped when having padding with native border. Lots of mostly cosmetic cleanups to GL2 paint engine Move the 0.5 offset we add for aliased rendering to updateMatrix() revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| * QUrl::toEncoded() fix for the case of "password, but no username".David Faure2009-12-282-5/+16
| | | | | | | | | | | | | | | | | | | | QUrl::setPassword() without QUrl::setUserName() is actually useful, e.g. for kde's ldap:// slave. QUrl::toString() already handled this correctly, but QUrl::toEncoded() would forget the password in such a case. Autotest added. Merge-request: 2276 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
generated by cgit v0.12 at 2025-08-19 06:09:25 (GMT)