summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* TextEdit implicit size varied depending upon wrapMode.Martin Jones2011-01-201-2/+6
| | | | | | | | | We failed to reset textWidth before calculating the ideal width of the text. Task-number: QTBUG-16710 Reviewed-by: Michael Brasser (cherry picked from commit b481399c1c02a945e816f9385070883a0d795455)
* Fix compilation error.Jason McDonald2011-01-201-0/+2
| | | | | | | | | Protect #include of feature-specific header in #ifdef. Task-number: QTBUG-16652 Reviewed-by: Trust Me Acked-by: Jani Hautakangas (cherry picked from commit a2ebd9e3f84fb8fcd2be45e91a7c71f146961e23)
* Do not load aplication fonts on Symbian^1 and belowAlessandro Portale2011-01-201-0/+3
| | | | | | | | | | | | read http://bugreports.qt.nokia.com/browse/QTBUG-16514 for a recipy to reboot the phone just by handling with fonts. Symbian^1 is vulnerable, and Symbain^3 prevents a phone reboot. Therefore, I prefer to disable the app font feature for Symbian^1, until QTBUG-16514 us properly handled. Task-Number: QTBUG-16514 (cherry picked from commit 25ac59fcf1bb03c9af9a2c967218c96c7c77361a)
* Supporting Qt application fonts on SymbianAlessandro Portale2011-01-204-28/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch finally implements the missing application font support on Symbian. QFontDatabase's addApplicationFont[FromData], applicationFontFamilies and removeApplicationFont are now functional and allow an application to load, use and unload fonts at run-time. The underlying Symbian API comes with some restrictions/specialties. Most of them are worked around in this patch, the missing ones are left as part of QTBUG-16514: - The font file must be a file, not a memory buffer. Web fonts and qrc fonts come as memory buffers. These buffers are saved to a temporary .ttf file and the file is loaded by the underlying Symbian API. The temporary file can only be deleted after the font is unloaded. - The font file must be in a public location in order to be loadable by Symbian. It can for example not reside in the private application directory. Therefore, all application fonts (also those that are on the file system) become a temporary .ttf file in c:\temp\. - Symbian3/PR2 will come with a font table API which provides direct access to font tables. Symbian3/PR1 and below are missing this API, therefore, an own TFontStore is (ab)used to read font tables out of a font. This patch is considering both code paths in several occasions, making the Qt Symbian font implementation significantly less maintainable. - The fonts are loaded into Symbian's central font server. Loaded fonts from different processes can have colliding font typeface names (not file names) on that server. The server does not separate loaded fonts by their origin processes. Working around such collisions is part of QTBUG-16514. The number of fonts loadable at the same time by a Qt application is limited to the random value 5. Just to prevent abuse of the font server's memory. As usual, this patch was looked at by colleagues, and it was adjusted according to the feedback. But since the bus factor for the interaction of Qt's and Symbian's font systems is 1, I reviewed this patch, myself. Task-Number: QTBUG-6611 Autotest: tst_QFontDatabase::addAppFont (cherry picked from commit 770fb729929764a1f1c5fbd3d54714cf811c81e0)
* Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005fJan-Arve Sæther2011-01-192-2/+29
| | | | | | | | | | | | | | | | | | | | | | | The bug has been around for a while, but change 604c51f1fc5c7 made it emerge. The problem was that stretches were combined by always *maxing* them. The values of 'stretch' can be interpreted as this: -1: (the default) it means that the items should be stretched with the stretch factor dervived from the size hints. (In practice this means that they are distributed fairly). 0: Means that the item should not be stretched >0: Means that the item should be stretch with that number as a factor. This meant that combining one item with a fixed size(0) and another item with a default stretch (-1) the combined row stretch would end up being fixed. This also fixes how stretches are combined for spanning items too. Task-number: QTBUG-13551 Reviewed-by: John Tapsell (cherry picked from commit 7fbf1829e11504eca6a55f1e5dbddf2f658b5302)
* Fix header not found build errorShane Kearns2011-01-181-1/+1
| | | | | Task-Number: QT-4378 (cherry picked from commit 1de7a573c1f407d5126cf6ee1e25b4f92cbdda3c)
* Workaround crash when multiple QNetworkAccessManager instances are usedShane Kearns2011-01-187-41/+188
| | | | | | | | | | | | | | | | | | | Instead of each QNetworkAccessManager owning a QNetworkSession, they now share a QNetworkSession if they have the same QNetworkConfiguration. QNetworkAccessManager now uses passive roaming instead of application level roaming. The state change signal (entering connected state) is used to indicate reconnection instead of being triggered when sending an ALR accept(). This preserves the previous behaviour, as QNAM always accepted the suggested access point from bearer mobility. In the case of multithreaded applications, one QNetworkSession will be created for each thread which uses QNetworkAccessManager, as QNetworkSession is not thread safe. Task-number: QT-4378 Reviewed-by: Markus Goetz Reviewed-by: juhvu (cherry picked from commit ec4b73992eb7fb7254bb7a1524b8691ef2123b9f)
* Fix to data detaching in OpenVG pixmap dataJani Hautakangas2011-01-181-2/+10
| | | | | | | | | | | | | QImage::converToFormat(format) won't detach QImage if format stays the same. Because of this, internal QImage buffer of QVGPixmapData was not deep copied. Drawing to QPixmap target modified the original QImage that was used to create QPixmap and in some cases crashed because paint engine referred to wrong target. Task-number: QT-4407 Reviewed-by: Jason Barron (cherry picked from commit b928bab9dde43cf3acace6dfae0ae6a4f6649650)
* Remove toolcheck from generic clean targets for symbian-sbsv2Miikka Heikkinen2011-01-181-3/+5
| | | | | | | | | | | | Toolcheck can cause generic clean fail (i.e. "make clean" or "make debug-clean") for e.g. environments where Carbide command line tools have not been installed, because sbsv2 toolchain does a check for all tools related to target platforms, even though they are not needed for actual cleaning. Task-number: QTBUG-16691 Reviewed-by: Janne Koskinen (cherry picked from commit c756d5cffdc31228b9ab9388c307bf4eb705b923)
* Don't crash Qt Creator when debugging an object aliasAaron Kennedy2011-01-181-1/+1
| | | | | Task-number: QTBUG-16131 (cherry picked from commit 3526db3b8832c357b368014e6c8ebab63d4071da)
* QTBUG-16110 updating the softkeys when app comes to foregroundmread2011-01-181-0/+3
| | | | | | | | | | | When an app is in the background and creates a window with softkeys, the softkeys are not updated when the app comes to the foreground, so they look faded. This change updates the softkeys when the app comes to the forground. Task-number: QTBUG-16110 Reviewed-by: Jason Barron (cherry picked from commit 37faa3ba7c66d14e1ecbf75e93d9f0d27fa57a76)
* Fix one character displacement for cursor in line editsMiikka Heikkinen2011-01-181-0/+2
| | | | | | | | | | | The variable m_inlinePosition was not updated when m_preeditString was cleared in QCoeFepInputContext. This resulted in cursor displaying up one character beyond where it logically should have been when using HW Qwerty keyboard on E7 and similar devices. Task-number: QTBUG-16238 Reviewed-by: axis (cherry picked from commit 81351f2c6f9a939e4c34cb3be6280d396c21941f)
* Fix double click event on Mac OS X.Fabien Freling2011-01-171-1/+3
| | | | | | | | | Fix an issue where the double click would be triggered even with different mouse buttons. Task-number: QTBUG-8222 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 4ea4bcc2ddea6fc6899c14bb50b22f58b51bf7ca)
* Proper fix for QGraphicsItem crash.Yoann Lopes2011-01-171-3/+2
| | | | | | | | See 8ffb49a4ac68b1c243b25343053e6e99f97ec2e7 Task-number: QTBUG-16374 Reviewed-by: TrustMe (cherry picked from commit 46ede046a34c822c612c55fdb1dc93dffe3fc6b6)
* fixed CI gate flagged spelling error: occured -> occurredJeremy Katz2011-01-171-1/+1
| | | | (cherry picked from commit c3d2d583121219836714609b250e4e52e33e393d)
* various fixes to deal with CI gate failuresJeremy Katz2011-01-174-16/+117
| | | | (cherry picked from commit deef2cb5e01b871008b08b81691ad4a46deca328)
* Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is staticJeremy Katz2011-01-173-4/+2
| | | | | | | | The test failed to build because QNetworkProxyFactory can't be instantiated (pure virtual member queryProxy()), but doing so isn't necessary. The test has also been removed from the network tests because it relies on a static configuration, but can not guarantee that the configuration exists. (cherry picked from commit 4d0cd05e98c3e83a4d1871c139cd8b4a2a86e988)
* QNetworkProxyFactory::systemProxyForQuery() for SymbianJyrki Jaakkola2011-01-176-0/+383
| | | | (cherry picked from commit 3c5eb8766e73c855782552f7c6472801e8ae820c)
* Fix ConnMan bearer plugin to use new net.connman service name.Leena Gunda2011-01-174-585/+20
| | | | (cherry picked from commit 8eab49de0548363b18c6e2c7b4ff4a8b722992d6)
* Fix QSystemSemaphore handle management issues in SymbianMiikka Heikkinen2011-01-141-4/+16
| | | | | | | | | | | QSystemSemaphore native RSemaphore handle was unnecessarily created again on each acquire. The creation logic was also susceptible for random failures when two or more threads tried simultaneously acquire the semaphore. Task-number: QTBUG-16615 Reviewed-by: Janne Koskinen (cherry picked from commit 570e7b38487455d394b5b74a59edc639f3dc416f)
* Fixed build failure on platforms other than SymbianGareth Stockwell2011-01-131-2/+8
| | | | | Reviewed-by: Ruth Sadler (cherry picked from commit 124ad6e903767fae510e0c2f0aba4029564a95c8)
* Fixed resource leak in Phonon MMF backendRuth Sadler2011-01-131-0/+2
| | | | | | Task-number: QTBUG-16513 Reviewed-by: Gareth Stockwell (cherry picked from commit b58eb0419f9f724af5d9baf8bbce4e0f1e2f3f8b)
* Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-1317-14/+336
| | | | | | | | | | | | | | | | | | | | | The Phonon API does not provide any way for the client to specify which network connection should be used for streaming playback. If the application already has a connection open, using a bearer other than the default (e.g. using WiFi when the device default is GPRS), it may be desirable to use it for streaming, rather than allowing the Phonon backend to open a second connection on the default bearer. This patch adds a custom property on the Phonon::MediaObject, called InternetAccessPointName. The client can specify the IAP which Phonon should use by setting this property. Note that support for this property is only provided in the Phonon MMF backend. Task-number: QTBUG-11436 Reviewed-by: Gareth Stockwell (cherry picked from commit 1640acce5ca8f49c5655edffa2a1108048c5a414)
* Fix qglthreads test crash on SymbianJani Hautakangas2011-01-131-2/+18
| | | | | | | | | | | Use less GPU memory to make tests pass and skip threaded rendering since eventually tries to access main RWindow from secondary thread, which is not allowed on Symbian Task-number: QTBUG-13525 Reviewed-by: TRUSTME (cherry picked from commit e49868217e29f13dba28a2fe199d82268655b9fb)
* rebuild configureOswald Buddenhagen2011-01-121-0/+0
| | | | (cherry picked from commit 5d8a544b34e04d30901658aece96040e252f3b7d)
* Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-123-1/+12
| | | | | | | | | | | Currently Symbian doesn't support semi-transparent EGL surfaces. WA_TranslucentBackground attribute is ineffective if set after EGL surface creation. To enable translucency in this case we need to recreate backing store to get raster surface which supports translucency. Task-number: QT-4416 Reviewed-by: Jason Barron (cherry picked from commit d62e9f4a6fe199ae790b1561fd4ba9ea84bd4d1e)
* OpenVG paint engine doesn't draw glyphs well to non-integer offsets.Jani Hautakangas2011-01-121-2/+2
| | | | | | | | | Solution is to round adjustment offsets to integer values to prevent blurry text. Task-number: QTBUG-16240 Reviewed-by: Alessandro Portale (cherry picked from commit e0ed2387bc818f11b16460b0150d4ea75bcf37d6)
* Update copyright year to 2011.Jason McDonald2011-01-1110433-10520/+10520
| | | | | Reviewed-by: Trust Me (cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
* Fix handle leak in symbian QTimer implementationShane Kearns2011-01-112-2/+42
| | | | | | | | | | | | | | | The timer handle was only being closed when a timer was cancelled, which resulted in a leak for one shot timers that have completed normally. Instead the timer is now closed in a destructor (closing null handles is safe, so it doesn't matter if the handle was never created - e.g. in the case of a zero timer) Also added a handle check before creating a timer to prevent a leak in case the start function is called twice in the backend. Task-number: QTBUG-16380 Reviewed-by: mread (cherry picked from commit 2b1b617664bfc78f6e95e53dc0f9749bd1f2d27a)
* Fix crash in QTextBlock::next()/previous()Jiang Jiang2011-01-111-2/+2
| | | | | | | | | | We should check not just p but also n in next()/previous(), which is what isValid() does. Otherwise n == 0 will cause crash in QFragmentMap. Task-number: QTBUG-16279 Reviewed-by: Eskil (cherry picked from commit 64852122ba71bbb297b4f1e440f6fabee16ca2fe)
* Fix regression in text rendering in OpenGL2 engineEskil Abrahamsen Blomfeldt2011-01-111-4/+0
| | | | | | | | | | | | | | | | Change 532115bcaa370af827a5cbad017b272842c5aacf introduced a regression by fixing a typo in the QT_OPENGL_ES_2 macro. This caused a broken and untested code path to be used in the GLES2 case. Since the QImage scanlines are 32 bit aligned, QImage::width() cannot be used when copying the data. Rather than pass in bytesPerLine() to the GL function, I opted to revert to the proven behavior, where the pad bytes are never read by GL but each scanline is copied separately, to avoid further regressions on different hardware. This also seems like the more correct approach, as the pad bytes should ideally not be copied into the cache texture. Reviewed-by: Samuel (cherry picked from commit 7a54885b1df9baf793374e3cb9fdf8be93ee7c80)
* Fix for qtdemo bugJerome Pasion2011-01-111-3/+3
| | | | | | Task-number: QTBUG-15931 Reviewed-by: Kevin Wright (cherry picked from commit 963ada5805d61e318a04295b6d06e527b49cdb7a)
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-1015-318/+318
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update pathview test
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2011-01-1021-2761/+144
| |\ | |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-103-67/+89
|\ \ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix loaded() signal to be emitted only once
* \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-1021-2761/+144
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: network tests: make IMAP, FTP testdata more flexible. Remove garbage empty test. tst_networkselftest: add checks for echo, daytime
| * | | network tests: make IMAP, FTP testdata more flexible.Rohan McGovern2011-01-106-51/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all hardcoded IMAP/FTP fixtures into network-settings.h. Make it work with new and old network test server. Reviewed-by: Markus Goetz Task: QTBUG-15114
| * | | Remove garbage empty test.Rohan McGovern2011-01-1014-2710/+0
| | | |
| * | | tst_networkselftest: add checks for echo, daytimeRohan McGovern2011-01-101-0/+2
|/ / /
| | * Update pathview testAlan Alpert2011-01-1015-318/+318
| |/ | | | | | | | | | | | | This updates the tests to match the correct behaviour as of 1ba3e41f09ea719249286fede5d3fe96621ccb61 Task-number: QTBUG-16357
| * Fix loaded() signal to be emitted only onceBea Lam2011-01-103-67/+89
|/ | | | | Task-number: QTBUG-16319 Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-075-6/+10
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: CLucene: Use the right delete operator. Examples: Fix compilation with namespace. fix build with QT_NO_BEARERMANAGEMENT
| * CLucene: Use the right delete operator.Christian Kandeler2011-01-072-2/+2
| | | | | | | | | | Task-number: QTBUG-15787 Task-number: QTBUG-15788
| * Examples: Fix compilation with namespace.Christian Kandeler2011-01-072-4/+4
| |
| * fix build with QT_NO_BEARERMANAGEMENTPeter Hartmann2011-01-071-0/+4
| | | | | | | | | | | | | | | | start() is only defined when using bearer management; that method calls open(), which we just call directly if not using bearer. Reviewed-by: Markus Goetz Task-number: QTBUG-16477
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-0723-24/+79
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes crash in QGraphicsItem's destructor. Doc: Fixing typo
| * | Fixes crash in QGraphicsItem's destructor.Yoann Lopes2011-01-072-1/+56
| | | | | | | | | | | | | | | | | | | | | | | | Crash introduced by 783a278f243c6411f5f32d11f2165b9eed9b6f8c. Autotest written by Niklas Kurkisuo <ext-niklas.kurkisuo@nokia.com> Task-number: QTBUG-16374 Reviewed-by: TrustMe
| * | Doc: Fixing typoSergio Ahumada2011-01-0721-23/+23
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-0713-254/+21
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fix crash when closing QFontDialog::getFont() dialog Fix timer warning when deleting item views Remove support for automatic tactile feedback from QS60Style Remove warning about null cursor handle on S60 while handle is valid
| * | Merge branch 'review-4.7' into staging-4.7Gabriel de Dietrich2011-01-0713-254/+21
| |\ \
generated by cgit v0.12 at 2025-03-21 10:49:45 (GMT)