summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Don't use Cocoa code unconditionallyAndy Shaw2012-11-141-0/+2
| | | | | | | | | | | The Cocoa code should only be used if QT_MAC_USE_COCOA is defined, this was causing problems in Carbon with menus which are now resolved. Task-number: QTBUG-27960 Change-Id: I60186d69a869def4b2f03f1b0fdde82208fcfbe5 Reviewed-by: Pasi Matilainen <pasi.matilainen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* fix binding of bool type in mysql driverMark Brand2012-11-131-1/+6
| | | | | | | | | | | | | | | | | | | MYSQL_TYPE_TINY should be used for binding bool input value. MYSQL_TYPE_LONG might be too big for bool, resulting in bools being saved in the database as int 127. The problem was not specific to the vendor's BOOL column type. http://dev.mysql.com/doc/refman/5.0/en/numeric-type-overview.html http://dev.mysql.com/doc/refman/5.0/en/c-api-prepared-statement-type-codes.html Added generic autotest to make sure that binding bool works. All drivers should pass this test. Task-number: QTBUG-27763 Change-Id: I4e69f8e3b32fffb702ec9fa8a80ff5c50dea954b Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Bill King <bill.king@nokia.com> (cherry picked from qt5/qtbase commit 593b8f7f0b35ddc424d8ccbd5df11fcf2442858e))
* Update Qlocale data with CLDR 2.0.0Konstantin Ritt2012-11-103-4532/+5150
| | | | | | | Change-Id: Ia5adad0b51a8db6e91ad60288eab67e506c19e47 Reviewed-by: Mehdi Fekari <mfekari@rim.com> Reviewed-by: Denis Dzyubenko <denis@ddenis.info> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update Qlocale data with CLDR 1.9.1Konstantin Ritt2012-11-103-3387/+3431
| | | | | | | | this is the same data we have in Qt 5 right now. Change-Id: Ic4cea4fdde2001432f33b0cb658508756cc9e8d3 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
* QtConcurrent: Fix for leak in QFutureOrgad Shaneh2012-11-083-5/+46
| | | | | | | | | | | | | To avoid leaking when converting a QFuture<T> to a QFuture<void> we need to have a separate ref. counter for QFuture<T>. When the last QFuture<T> goes out of scope, we need to clean out the result data. backported from qt/qtbase commit 731ba8ed08f80644b403556638c7f6229e678ebe Original commit by Christian Strømme Task-number: QTBUG-27224 Change-Id: I0c6b525cf241b5c559a1bab4e0066cd4de556ea8 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix for memory leak in ResultStoreOrgad Shaneh2012-11-081-1/+4
| | | | | | | | | | | | | | | In ResultStoreBase::addResults() it possible that the ResultItem we create is invalid (filter-mode enabled). Since an invalid ResultItem won't have any result data, we need to make sure that we don't allocate any data for it. Backported (with minor technical changes) from qt/qtbase commit 6039179373f7552c2a711b06a7d69b9ca9d2b175 Original commit by Christian Strømme Task-number: QTBUG-27224 Change-Id: I5c941363c211d0414d461e7b1b0274c80f3d69b9 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Use slogger2 for logging on Blackberry instead of writing to stderrFabian Bumberger2012-11-082-0/+62
| | | | | | | | | Backport from Qt5: c86ed49a7989adb3e2e3c42794e44609f12ce493 Change-Id: I09d84b08f7c90348b4104f7e52d76ee27a4837af Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
* qpa: Fix rendering issue in blitter engine (negative scaling factors)Julien Brianceau2012-11-081-1/+5
| | | | | | | | | | | | | | A 180° rotation results in a TxScale QTransform with negative scaling factors (x=-1.0 y=-1.0). This is not properly handled by blitter paint engine yet, so use software rendering fallback in this case. This rendering issue can be seen when using "-webkit-transform" CSS property in WebKit with DirectFB QPA platform. cherry-picked from qt5/qtbase 07ea3cf0b3883979e84bd91a5dc6a7a126de3123 Change-Id: I0911fd1166a3968d0a1d6bcca47ce2b26866de44 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Accessibility: itemviews check for valid model.Frederik Gladhorn2012-11-081-11/+60
| | | | | | | | | | | | | The problem is that isValid() should return true as soon as we have a view widget. That sadly means we need to verify that the model is still valid whenever accessing it. This is a backport of the Qt 5 patch (I9237528abf2f5c75a73382525103307e9ca15f05) Change-Id: I9237528abf2f5c75a73382525103307e9ca15f05 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Fix GIF image decoding: do not zero transparent pixelsaavit2012-11-081-9/+6
| | | | | | | | | | | | For the special transparent color index, the decoder would skip writing anything out (thus leaving the pixels at 0 rgba value). Although correct for later frames, for the initial frame this would loose the color information for such pixels (which one otherwise could have made visible e.g. by converting then image to an alpha-less image format). Change-Id: I316cefce8f21797feedebfbf98296ad84eaa4b99 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* HeaderView - call invalidateCachedSizeHint() on clearThorbjørn Lund Martsum2012-11-071-0/+1
| | | | | | | | | | | | This calls invalidateCachedSizeHint on clear, which is a logical thing to do. This is a backport of SHA aa2578a1006f17cff50ca39090bae2e1e090b59b Task-number: QTBUG-22528 Change-Id: I725748b314fd9d09441d3bf34c4607a4cc7162ed Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QNX: Fix build with QNX SDP 6.5.Sergio Martins2012-11-071-1/+1
| | | | | | | | | | | | | __EXT_LF64SRC isn't defined in this case. This also makes it consistent with mkspecs/common/posix/qplatformdefs.h which uses QT_USE_XOPEN_LFS_EXTENSIONS and QT_LARGEFILE_SUPPORT to decide which type of stat struct to declare. Backport of b8e7265a5055da754c8b4cb2fb97b9367e83791b Change-Id: I04e990a2402aee347870c3578bf6f76b837b8e1e Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QWindowsVistaStyle: Restore altered brush origin.Friedemann Kleint2012-11-071-1/+2
| | | | | | | | | | | | The line to restore it was missing, and the leftover variable caused a warning, which was removed in abe5a0a432116963d22c4ef501a4dfd2393d66fb . Task-number: QTBUG-27828 Change-Id: I00b8b89b07bec38a1660c3a9c61220b6d0d7eb48 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> (cherry picked from qtbase/96ebbad5f03d6db5fa81f284ccbdaf4b6259c27b)
* Fix submenu navigation.Friedemann Kleint2012-11-071-0/+10
| | | | | | | | | | | | | | | Bring back code that was removed in Qt 4: 60324267fbb8a8554e62aaf9ef01360709292320 for QTBUG-7411 . This code reselects the submenu action of a currently opened popup when the mouse is moved to the submenu crossing other actions. In addition, make sure it only triggers when the reason is not keyboard selection. Task-number: QTBUG-20094 Change-Id: Ibb73f83e86635083aad8b1e79fc0fdd512c65754 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> (cherry picked from qtbase/0a91c9df01ec8f0c4aef9ce6e5e9bc3804fb80c2)
* Adding PAC and exclusion list support to BlackBerry Qt proxy implementation.Andrey Leonov2012-11-062-4/+26
| | | | | | | | | The additional proxy functionality is only available starting BPS API version 3.1.1. (cherry picked from commit 4b71432987ca9ff059d04f0e5f567b8eb09717f9) Change-Id: Ia59adf00a15e7b0a8fc124fcbb598c9c7c331358 Reviewed-by: Peter Hartmann <phartmann@rim.com>
* QTranslator: Use resource memory instead of copying itThomas McGuire2012-11-051-19/+44
| | | | | | | | | | | | Previously, translations in resource files were loaded through QFile and the data was copied. Now, simply use the resource memory in-place. This is a backport of qtbase commit 92d75077d686fcad26b5ad02a40c3987fb1fc82b Change-Id: Id96c58e96db3bed669dd211011aaed880b9a0133 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* fix bug in QLocalSocket::waitForReadyRead on WindowsJoerg Bornemann2012-11-051-1/+1
| | | | | | | | | | | | | | | | | | We must not close the socket, if there's still data in the read buffer. Also waitForReadyRead must return true, even if the pipe is broken after we've read data. QLocalSocket::readData will close the socket after the buffer has been drained. This fixes the flakiness of tst_QLocalSocket::threadedConnection. In Qt5 large portions of this code has been rewritten and this fix does not apply. Task-number: QTBUG-27816 Task-number: QTQAINFRA-574 Change-Id: I467340d4dbab11056e6720b145a94a87156cb419 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Cocoa: QPrintDialog does not show/closes down immediatlyRichard Moe Gustavsen2012-11-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | This happends if an event loop recursion ends before the native print dialog gets executed (in the same scope). The reason is that the event dispatcher gets interrupted as the first recursion ends. And (because of the big difference between how AppKit implements modal windows compared to Qt) this sets a flag in the dispatcher that gets handled on the next callback to QCocoaEventDispatcher::processPostedEvents. This will tell the dispatcher to break out of the current modal session. But since it cannot detect that an alien (native) session is now running, it closes down that session by accident instead. While code can be written in the event dispatcher to detect this problem, it ends up more clean to just work around the problem from the native dialogs instead. This to avoid making the dispatcher more complex than it already is. Native dialogs is a bit messy already, and the work-arounds needed should be isolated inside those components, and not inside the dispatcher. Change-Id: I8cb90b3a7a41b2122ae39e1af5eee0746505aa3a Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* x-compile with mingw: fix codec linker errorsPeter Kümmel2012-11-031-4/+4
| | | | | | | | | | | | Don't build codecs into Core when plugins are used. Qt5 doesn't use plugins for the codecs any more and they are part of Core. This change was considered too drastic for Qt 4.8, so no backport is possible. Task-number: QTBUG-27618 Change-Id: I01347645cedc6f4ecaf3158ea8336b0672ac9a46 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Qt 4 - QHeaderView - correct drop on manual QHeaderView sectionmoveThorbjørn Lund Martsum2012-11-031-1/+1
| | | | | | | | | | | | | | | | | | | This fixes an error in the calculation of the exact drop position when an user is moving a section in QHeaderView. Before we compared a mouse-position local to the widget (pos) with a summed length of sections (posThreshold). However we need to consider/substract the headers offset to make the posThreshold comparable to the local mouse position. This is a backport of SHA d625535728154fc9ca576bf6472c6b5057a96f17 This solves e.g. Task-number: QTBUG-14814 Change-Id: I8e2c820dc9018fb3d14b71f28aa317417c997a44 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Doc: Updated links in qt-webpages.qdoc to Digia equivalent.Jerome Pasion2012-11-021-3/+0
| | | | | | Change-Id: I7b46898ae6ccc08d96095f1658f87c063aa6b487 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Removed usage of pipe in Blackberry event dispatcherBernd Weimer2012-11-024-42/+78
| | | | | | | | | | | | | | | Using a pipe for thread wake-ups is inefficient and can introduce significant latency. Replaced the pipe by directly sending a BPS event. Refactored the wake-up code in the private class of the UNIX event dispatcher. Backport of 9dacccd0391219c97c01e89f0547ee002abb1e55 Change-Id: I222516f53afdd8daf845249cc33172399cfd6c21 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Jeff Kehres <jkehres@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Mac: Correct writingSystem check value for ChineseLiang Qi2012-11-011-2/+2
| | | | | | | | | | | | | For simplified and traditional Chinese. Based on the Apple doc: Internationalization Programming Topics - Language and Locale Designations. (backport of commit edfb24009cf22a0f0277be5d595b48ef9af9c3bf from qt5/qtbase) Task-number: QTBUG-27130 Change-Id: I08969bfba17b6a2589dca5da83b668bb2d8f3e31 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Blackberry bearer plugin: Only Report working interfaces as activePeter Hartmann2012-11-011-3/+2
| | | | | | | | | | | | | | | | | Some interfaces might be connected but not working (e.g. no IP address, no gateway etc.) In practice, this prevents the USB interface (among others) from being reported as active and thus the QNetworkConfigurationManager as being reported as online. We only want Wifi and 3G etc. connections to be reported as online when they are up. (cherry picked from commit b9551c1b47277d58d86a82ce15501663257ed9a1) Change-Id: Ia175d701280db44a08b9535803a94806a5d6f30f Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* QtNetwork: introduce configure switch to use system proxies by defaultPeter Hartmann2012-10-312-0/+7
| | | | | | | | | | | | This option is opt-in (default: no). When configured with "-system-proxies", Qt automatically picks up the system proxies. (backport of commit f7893223e84db86dcdd860c625663d7006fcdad6) Change-Id: I95c3b17abee0691991a60a386052b4c2989f896c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix QDBusServer with more than one connectionJan Arne Petersen2012-10-313-8/+15
| | | | | | | | | | | | | | | | Create a new QDBusConnectionPrivate for every new connection in qDBusNewConnection instead of creating a single QDBusConnectionPrivate in the QDBusServer constructor which gets assigned the latest connected DBusConnection in qDBusNewConnection (and loses track on all previous DBusConnections). Also extend tst_QDBusConnection::registerObjectPeer() test with multiple connections to the server. Task-Number: QTBUG-24921 Change-Id: I4341e8d48d464f3fe0a314a6ab14f848545d65a0 (cherry picked from qtbase/a386194f9952683c0be5028f2b7f0ce9617fe404) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix a crash in QFileDialog when selecting an invalid name filter.Friedemann Kleint2012-10-311-5/+7
| | | | | | | | | | | | When nameDetailsVisible is set to false and an invalid/empty string is passed to selectNameFilter(), the regexp used to strip the filter off the suffixes returns empty and a crash occurs. Change-Id: I926ea49514ff25a103977d8121fca1cf83d647f5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from qtbase/d0aa81ee104107db1ce41a9bf0f91d4cb144f7de)
* Fix debugger detection when running on Linux.Friedemann Kleint2012-10-311-20/+28
| | | | | | | | | | Newer Linuxes have a symlink named 'exe' to the executable and 'cmdline' is empty. Task-number: QTBUG-27632 Change-Id: I45eb2186e2608e9600c4b6b27a033d8b1350deee Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix mmap usage.Jędrzej Nowacki2012-10-311-2/+2
| | | | | | | | | | Add missing MAP_NORESERVE and fix error checking. Special thanks to Olivier JG for debugging the issue. Task-number: QTBUG-27322 Change-Id: Ia9f4aa80415f0127318714912b524131a5b0f18a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fixing font database memoryleakKarim Pinter2012-10-311-2/+2
| | | | | | | | | | | There is one case when the QFontEngine* fe is loaded, then FcPattern* match loaded from FcFontRenderPrepare is not deleted. Valgrind was showing this problem, after the fix there is no memoryleak in Valgrind. Change-Id: I8ef928fe8190a6d26f2e5275b85e08a7a8796a7b Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jiang Jiang <gzjjgod@gmail.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* QNX: Remember information on whether a file is a linkThomas McGuire2012-10-311-0/+7
| | | | | | | | | | | | | This avoids an additional call to lstat() When using QDir::entryList() with the QDir::NoSymLinks flag. This is a backport of qtbase commit 03cd922e312428aca54892039da9ed79479cfa17 Change-Id: I5ef10c369ce6790c8d0de1346436f9ea7aaa4194 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* QNX: Use extra information in dirent to avoid stat() callsThomas McGuire2012-10-313-2/+69
| | | | | | | | | | | | | This improves iterating over /usr/bin with QDirIterator by more than half, from 36 to 13 milliseconds. This is a backport of qtbase commit 391d2e37f3b301097cd23fdaf99dc34ed6a114a5 Change-Id: I45e9159c82d1840f21dbab81fc39f140490549b7 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView - fix minor bug in visualIndexAtThorbjørn Lund Martsum2012-10-311-2/+2
| | | | | | | | | | | | This fixes a minor bug in VisualIndex triggered when calling resizeSection with size 0 (but not hideSection). It is mostly cosmetics - but it is still a bug. This is a backport of SHA 73a5bc2aac7638438dfde260a4246359a06e89ae Change-Id: Ic3e1ce584d8befa501c670c085435248ebaa681b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView - length returns wrong value fixThorbjørn Lund Martsum2012-10-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | setSectionHidden called with (logindex, true) will sometimes not do a (correct) call to resizeSection(logicalIndex, 0) at once. However it does execute d->doDelayedResizeSections(). Therefore the section is going to be hidden later. However it is a problem that the length meanwhile is wrong. (That is a value that is not the sum of the sections) This is fixed by execute updates before returning the length. This is a backport of SHA 125016ad241125176e5bebab94eebcf50fac20bc Task-number: QTBUG-14242 Change-Id: Ia1d2f6db3213792b250a6a37942b56554261cd3a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView - no big update work if updates are disabledThorbjørn Lund Martsum2012-10-311-0/+7
| | | | | | | | | | | | | This is not a major boost, but still a nice optimization that can speed up hideSection and resizeSection with about 40% if updates are disabled. It is backport of SHA 3bb0c88de8894fc05ad1558b96ae05ceeff64b78 and a5201007f255a07f7ba07981745eeaec41a14a34 Change-Id: I33b83940003c391e5dae549353a6beb27928f92a Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Corrected licensing info and links point to Digia in qmessageboxjutaipal2012-10-301-2/+2
| | | | | | | | Change-Id: I1051b20c287cba927b668290c46749c27edbde21 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Blackberry: Fixes QWindowSurface::grabWidgetRafael Roquetto2012-10-304-5/+66
| | | | | | | | | | | | | | We are reading from the back buffer instead of the front buffer when grabWidget is called. This adds an override so that we query the front buffer (the last rendered frame). This change is not needed in Qt5 - the api there is different and grabWidget() no longer exists. Change-Id: I691ee589d56b60eab339de536b52fd90cee5ff85 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix for slowness of touch move eventsBernd Weimer2012-10-301-60/+46
| | | | | | | | | | | | | In the event dispatcher native events will be processed in a tight loop to drain the queue. IO events and timers will be postponed. Backported from c4b2d77f40a42a67480bb49aa63b0953c80c024a Change-Id: Iaf408425000e7fd6fdbf0992bbf927d03a650581 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* BlackBerry: Query dynamic buffer count at runtimeRafael Roquetto2012-10-302-2/+16
| | | | | | | | | | | | | While unlikely, there are cases in which QBBWindow::renderBuffer() is called before the window buffers have been created. Without this check, the program will abort on QBBBuffer constructor, since the value that will be passed to it will be of an invalid buffer. cherry-picked from qt5 c89dc4fdd2770ba3ad52303a2f4cb0c6403a2ecd Change-Id: I1f1cde76a364480f3bc77eaaa59ca3cfba2eb618 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* QNX: Use inotify on QNX systems that support itThomas McGuire2012-10-303-0/+17
| | | | | | | | This is a backport of qtbase commit fc0cbef59599174589a606838a9b55ba6a07ef06 Change-Id: I27ca7222ed0e622bdae405f0802ab29e22f4cbbf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix QCoreApplication::applicationFilePath() performance.Sergio Martins2012-10-301-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | Listing all files with QDir is slow. Instead, use argv[0] for zygotized apps and _cmdname() for non-zygotized. Apps run through the terminal will fall in the zygotized case, which is ok. Note about zygotized apps: Zygotized apps don't have an executable, they live in a shared object file. These apps are run through a deamon that forks and dlopens() the shared object ( for performance reasons ). For this reason we can't use _cmdname(), since it just contains the the file path of the daemon. On the other hand, non-zygotized apps have a bogus argv[0] when run through the navigator ( command line is fine ). Change-Id: I73d1cd742a70d1be36a8efe829671d6d7594a6fb Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QGLTextureGlyphCache: Fix text rendering artifacts on NVIDIAJonathan Liu2012-10-301-2/+2
| | | | | | | | | | | Check GL_VENDOR to test whether using NVIDIA graphics. On Linux, GL_VERSION and GL_VENDOR contains "NVIDIA". On Windows, only GL_VENDOR contains "NVIDIA". Task-number: QTBUG-27658 Change-Id: I5e74d07ecb9522d1a86ac2953415a51bbdbe8c49 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> (cherry picked from qtbase/8900bc778f326e6b22ecfceb0b0b64394f3510fb)
* Fixed GCC 3.4 build with sse2 enabled.Samuel Rødal2012-10-301-1/+2
| | | | | | | | | With minimal effort we can keep the GCC 3.4 build working. Task-number: QTBUG-19803 Change-Id: I31611a27b97d5ac426ea857d8f1b656dc6f5377a (cherry picked from commit 7d7f09650c3b3b2990f16ff4a6401a8c74e1f868) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed crash on destruction of animating QDockWidget in a QMainWindowRohan McGovern2012-10-302-2/+5
| | | | | | | | | | | | | | | | | | | | | It doesn't make sense to hold an unguarded pointer to a QPropertyAnimation while assigning ownership of that animation to the animated widget. Destruction of the widget while the animation is in progress causes the animation pointer to become dangling; then the widget is removed from the containing QMainWindowLayout, which attempts to abort the animation, dereferencing the invalid pointer. The crash can be reproduced sometimes with tst_QDockWidget::taskQTBUG_2940_resizeAfterUndocking (which is in Qt4 only). (cherry-picked from qtbase 33214af3784feacb2d5188bbf07da92f45f582f9) Change-Id: Ia886f64fdb6720914a46bc7f32c71cf4fc81c28d Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* qpa: Fix drawPixmap rendering using CompositionMode_Source in DirectFBJulien Brianceau2012-10-231-1/+3
| | | | | | | cherry-picked from qt5/qtbase d8c8057c03fc906f3bee0905246ca18351bd9e1b Change-Id: I6728307150c75a8e01f498cf55320a2956aa07ad Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QDeclarativeTypeLoader: Avoid stat() calls to . and ..Thomas McGuire2012-10-221-1/+1
| | | | | | | | | Not needed in Qt5, QDirIterator is not used there, Qt5 contains a completely new type cache. Change-Id: Ifb97cfda0589210783bccc65ab27a546e0f1fca8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* BlackBerry: Change base font sizes from pixels to pointsKevin Krammer2012-10-221-1/+3
| | | | | | | | | | | | | | Previously recommended fonts sizes in pixels do not work very well on the new high resolution devices. Current UX documentation recommends point size 8 for normal text which works well on both types of devices. Backport of qtbase 4d693b6cdf879a03f77f2a06ca0e1be5605c0fc0 Change-Id: I9507b77a5e814b33cf90e714ae62d64e468710b9 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use the right properties when checking the frame's marginsAndy Shaw2012-10-221-4/+4
| | | | | | | | | | Changed it to check the Frame*Margin property instead of the Block*Margin property as this was incorrect for a QTextFrameFormat. Task-number: QTBUG-22173 Change-Id: I2c3066165fb592ed034874b1180593822859f933 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> (cherry picked from qtbase/d060620e6cd3c94e7e0ff809b21593b9c0da0be2)
* QNX: only enable NEON instructions for supported architectures (ARM)Peter Hartmann2012-10-211-1/+1
| | | | | | | | | | | They are not there on x86. This change is not needed for Qt5. Task-number: QTBUG-27612 Change-Id: I385ed5b18b6985f796054acbf4fca2667942f8d0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Doc: Update QThread class ref to reflect changes since Qt 4.4Sze Howe Koh2012-10-201-55/+96
| | | | | | | | | | | | | | | | | Remove advice to subclass QThread; promote thinking of QThread as a thread manager, not a thread; promote event-driven programming over time micromanagement; warn against common pitfalls. Result of collaboration in forum (https://qt-project.org/forums/viewthread/20691/) and mailing list (http://lists.qt-project.org/pipermail/development/2012-September/006738.html) This is a modified backport of qtbase commit d4ad9dbbf96884c0899e8f8116a8a056facd52d5 Task-number: QTBUG-16358 Change-Id: Ib7a8d40aa418b1d96e3e7070df074b396ae9ee7e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>