summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-134377-4389/+4389
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix Blackberry QPA plugin clipboard implRafael Roquetto2013-01-111-2/+4
| | | | | | | | | | | | | QBBCliboard::setMimeData was not cleaning the system clipboard aproppriately when m_mimeData != 0 but m_mimeData->userMimeData == 0, as it would return early before the empty_clipboard() statement. Also, we must not dataChanged() signal after the clipboard has been changed, because this is done by the parent class. cherry-picked from qt5/qtbase 0a977e36e06a69583d8e4edc27ca3df634c53404 Change-Id: I694490e26035d75c3c54e76c538982037c3ef799 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix title bar height of Aero wizard on Windows 8.Friedemann Kleint2013-01-102-9/+23
| | | | | | | | | | | | Windows 8 no longer allows for negative values to WM_NCCALCSIZE to shrink the title bar. Task-number: QTBUG-28435 Change-Id: Ib6aa95a98663c4dc8e9a18407b5d49a0daeab8f9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/5fb6331a17a5c43b91daddf4a30e46ccbd1419b5)
* Do not use getuid() and getgid() functions in VxWorksPasi Petäjäjärvi2013-01-101-1/+1
| | | | | | | | VxWorks has no concepts of users and groups, therefore no such functions exists on VxWorks. Change-Id: I56e1c80ffd4e8d88ae41e3a0bb97df05c6a2f98f Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Add struct keyword for timeval variable to remove ambiguityPasi Petäjäjärvi2013-01-101-1/+1
| | | | | | | | | | VxWorks does not have gettimeofday function, so make sure we pick correct definition for timeval. This is not needed in Qt5, because there is already struct keyword used for timeval variable. Change-Id: Iedb47e7c50610f64b0178527127fc003ee67ff4a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QSqlTableModel: fix dataChanged() index for removed edited rowMark Brand2013-01-101-1/+1
| | | | | | | | | | | | Last column index is columnCount() - 1 This change is not applicable to Qt 5. Task-number: QTBUG-28961 Change-Id: Ib962ab5f737bf9c216423ee9d0632757d33f3bd2 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Update Canadian(English) localeMehdi Fekari2013-01-101-2/+2
| | | | | | | | | Update dateFormat in Canadian(English) locale ("en_CA") to return: M/d/yy instead of: yy-MM-dd (Long: dddd, MMMM d, yyyy instead of EEEE, d MMMM, y) N.B: This doesn't concern Qt5 that uses the most recent version of CLDR (22.1) which already contain the fix above. Change-Id: I99f841c8f397086435d928d749c4d67e779f31f8 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Delay loading implicit importAlan Alpert2013-01-083-36/+66
| | | | | | | | | | | As a performance improvement to avoid accessing the filesystem unnecessarily, only import "." implicitly if types cannot be found in the existing imports. This is not a behavior change for type resolution, because "." already has the lowest precedence for type resolution. Change-Id: I5ac2a9fac85559eb96cba93c29d17068fe8171da Manual cherry-pick of qtquick1/dc96bfd00152e25f007511f64bff7c413f657886 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Fix crash when mapping coordinates to & from the root item.Nicolas Tisserand2013-01-081-4/+18
| | | | | | | | | | | | | | | | | | | The crash triggered by our (supported & documented) use-cases (calling map{From,To}Item with a null value), has been introduced earlier this year, by this change: https://qt.gitorious.org/qt/qt/commit/bec02b3f3 Also: * Clarify QDeclarativeItem::map{From,To}Item statement ordering. * Handle the engine-less item corner case. This change is a backport from the following commit in qtquick1: cae858768f7d16b79f3627cd5b077da89dc0c7c9 Change-Id: I6d387fb02ca65ab40365edda26a0ea60ff14446c Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Backport PathView currentIndex fixes from Qt 5Bea Lam2013-01-081-37/+58
| | | | | | | | | | | | | | Backport 447e5acb880ebda498891623dc4009984cb73bc6 and 0fc361f96b06ba318e70610e46beb421753cae9d which fix bugs related to currentIndex. The first commit ensures currentIndex=0 when all items are removed; the second ensures that the initial currentIndex value is respected and also resets the view correctly if the model changes. (Backport of Qt5 qtquick1 5d439d751267c64408bd27ab0e6548822146a35c) Change-Id: I6bfd826c97524ed0d06a168bed7f5c321b02b4d3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Update Turkish and Irish locales dataMehdi Fekari2013-01-071-2624/+2641
| | | | | | | | | | | | | | | Update Turkish and Irish locales data The Irish/Gaelic locale data (CLDRv2.0) in Qt4.8 doesn't provide all month/day names, and the Turkish AM/PM texts are not updated. This patch updates the locales data below and provides an autotest to compare the expected vs returned values: - Irisch locale data (based on ga.xml file): Add month/day names in both short and long foramt based on CLDRv22.1 data. - Turkish locale data (basod on tr.xml file): Update AM/PM text to return "ÖÖ/ÖS" instead of "AM/PM". N.B: This doesn't concern Qt5 that uses the most recent version of CLDR (22.1) which already contains the fixes above. Change-Id: Ic61ba192619582bdc6bb729f4b91f31ae2894ee0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Mac: Fixed text rendering in selected tab buttonGabriel de Dietrich2013-01-071-22/+11
| | | | | | | | | | | We resort to custom Qt rendering when selected since it looks better than using Carbon's HITheme engine. This is a backport of Qt 5's 65b39b3cdcdfe175d80ccf9428168ed51be77fd8, and also reverts commit f7bba6cc700f5f6b1ff6a40b8c475924de206022. Change-Id: I684db730f05bead16e16a0d1c8f20164e9fc70b7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* QtNetwork: blacklist two more certificatesMartin Petersson2013-01-051-0/+2
| | | | | | | | | | | | | | | | | The comodogate 72:03:21:05:c5:0c:08:57:3d:8e:a5:30:4e:fe:e8:b0 certificate is a test certificate and the MD5 Collisions was created as a proof of concept deliberately made to be expired at the time of it's creation. Task-number: QTBUG-24654 (cherry picked from commit 4c0df9feb2b44d0c4fcaa5076f00aa08fbc1dda5) Signed-off-by: Peter Hartmann <phartmann@rim.com> Apparently this commit was forgotten to cherry-pick to Qt 4. Change-Id: I86949eaa3c02483b0b66b4a620bfa88aaa9aa99b Reviewed-by: Richard J. Moore <rich@kde.org>
* Don't increase the reference count if dynamic_cast failedThiago Macieira2013-01-051-0/+2
| | | | | | | | | | | | | | If the dynamic_cast failed in QSharedPointer::dynamicCast or qSharedPointerDynamicCast, we should avoid creating the QSharedPointer that shares the weak and strong reference counts. In Qt 5, this does not imply a leak since the original pointer is stored internally for deletion. In Qt 4 it implies a leak under certain circumstances, which this change fixes. Task-number: QTBUG-28924 Change-Id: Id2de140de4cf676461e14b201ad250c53666b79d (cherry-picked from qt5 commit a094bf5a893c3cccffff10c1420bfbe3a3c02a7c) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Centralise handling & ignoring of SIGPIPE in qcore_unix_p.hThiago Macieira2013-01-054-46/+33
| | | | | | | | | | | | We had two instances of this function in the Qt source code, one clearly a copy of the other, so both had the same thread-safety issue. Instead, let's have one copy and have both write_nosignal() and sendto() call them. (cherry-picked from qtbase commit cb7d64170d62c9cda11ced7e5047070af678338b) Change-Id: I0f1354a8e9df8e6b10a02f86a940e3c6d1222087 Reviewed-by: Peter Hartmann <phartmann@rim.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix thread-safety of qt_ignore_sigpipeThiago Macieira2013-01-052-2/+10
| | | | | | | | | | | | | | The testAndSet operation would mean another thread could see the value of 1 and proceed to write(2)/sendto(2) before SIGPIPE had been ignored. If the pipe or socket were already closed by then, a SIGPIPE would be delivered to the application with its default action: terminate. (cherry-picked from qtbase commit 3f970c20f9afd5c9a1cc14d7f69882e13f6aaf1b) Change-Id: I62dc8f5fa14c1dd453d13e4053c642bd78fbc468 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
* BlackBerry: Reevaluation of timer list in event dispatcherBernd Weimer2013-01-051-11/+22
| | | | | | | | | | | In the event dispatcher the timer list has to be reevaluated after each call to filterEvent, because timers could be started in event filters. Backport of 9cfce43f19af87bc0a929b917da2901de7dbc193 Change-Id: Ib1feca6e970b3809e422f50164fd280b96beddf3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix QWidget::showFullScreen() on QPARafael Roquetto2013-01-051-1/+1
| | | | | | | | | | | | | When showing full screen, we need to enforce that the size of the widget *is* the size of the screen. When calling QWidget::resize(), there was a chance for the layout to bypass the screen size, causing the toplevel widget to be clipped. This fix is not necessary on Qt5. Qt5 implements this differently and correctly. Change-Id: I1f4467dd14310ee20376caba8780507f8d787720 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix QWidget::hide() on QPA platformsRafael Roquetto2013-01-051-1/+0
| | | | | | | | | | | | | We must check within QWidgetPrivate::hide_sys() if the widget has a platform window and hide it. Fixed on Qt5 as a side effect of 09163941268745bbe231d0b2c25697940aa40127 Change-Id: Id0f5e748e69789027cbde427d37655d19a4ccab2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Debao Zhang <hello@debao.me> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* SSL certificates: blacklist mis-issued Turktrust certificatesPeter Hartmann2013-01-051-0/+3
| | | | | | | | | | | | Those certificates have erroneously set the CA attribute to true, meaning everybody in possesion of their keys can issue certificates on their own. backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase Task-number: QTBUG-28937 Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23 Reviewed-by: Richard J. Moore <rich@kde.org>
* Elaborate shortDayName(), etc using default locale.Leonard Lee2012-12-201-10/+10
| | | | | | | | | | | | QDate::toString() should explain QDate::shortDayName() and QDate::shortMonthName() will be localized name using the default locale from the system. Task-number: QTBUG-28522 Change-Id: I3d475a11066b181945d85ace4d3cbb4d8fa19b73 (cherry picked from commit qtbase/4cf112b641f7ea9fb1ba87cefcef7ee98b6b0831) Reviewed-by: Liang Qi <liang.qi@digia.com>
* BlackBerry: QBBCursor implementationRafael Roquetto2012-12-196-3/+156
| | | | | | | | | | | | Implementation of QBBCursor, a QPlatformCursor subclass. Due to the lack of a proper cursor API from the underlying OS, this class only caches the current cursor position to make sure that the QCursor class works properly. Backport from qt5 290ed7f8fafd67197f773454223410bbe57fc4d3 Change-Id: I1bb4b2b416579641d03ca5611e335322a8d81ae2 Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add cursor position support to QPlatformCursorRafael Roquetto2012-12-193-1/+36
| | | | | | | | | | Based on qt5 4469de4ce7a72ab6824629bfe8483131aaf22137 Change-Id: I5886c11f3dcf72943e2956beaa92464657110ce9 Reviewed-by: Laszlo Agocs <lagocs83@gmail.com> Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Reset virtual keyboard when shown.Sergio Martins2012-12-191-0/+4
| | | | | | | | | | | | | | | | The keyboard mode is shared between applications. You can reproduce this bug by clicking on a spin box, it will open a number only keyboard, then close the application and run an application that shows a text edit: a number only keyboard will appear. PPS keyboard already does this. Backport of Qt 5 commit 019f9158e64ae24 Change-Id: I1ef8e32ae2958a604cfe618b765b23504997f0d4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QMenu: Do not set snapToMouse if a caused-widget exists.Friedemann Kleint2012-12-191-1/+1
| | | | | | | | | | | | | When clicking at the bottom-right corner of a menu in a menu bar, it appears at the wrong position. Add test and stabilize RTL-tests by making sure the layout direction is cleared should they fail. Task-number: QTBUG-28031 Task-number: QTBUG-2596 Change-Id: Ibc5ae916388753908e9f3ee98e8859faaa0c8723 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> (cherry picked from qtbase/bf178c77dda1db56ae698c1d31a6e3f685f4830f)
* Backport adjusting cursorToX for trailing spaces from Qt 5Eskil Abrahamsen Blomfeldt2012-12-192-15/+10
| | | | | | | | | | | This is a backport of d07982b104de5dc2b54bef09c071500ce22cf539 from Qt 5 which fixes cursorToX() in some cases, e.g. when a line filled with spaces is ended by a soft line break. Task-number: QTBUG-27354 Change-Id: Ia88873aeb3c0620044fefe24fc6bb1310e3aa339 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Allow qmljsdebugger argument and value to be separated by a spaceAurélien Gâteau2012-12-181-0/+4
| | | | | | | | | | | This change makes it possible to use the QML JS debugger with KDE applications. Change-Id: I1c6615c604a4023062fe6e6ead66dfcea9f8d493 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qtbase/fea68274b89a9bcde55eabbf6eb7bf2e8376d930)
* Return correct accessible name when a label has rich textJosé Millán Soto2012-12-161-1/+9
| | | | | | | | | When a QLabel was displaying rich text, the raw html was being returned as accessible name. Now the plain text is returned. Task-number: QTBUG-27302 Change-Id: I2fc469b4ca8fc3584b849bbe0a94d094d727d04f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* a11y: Do not refer to destructed QObject in Windows bridgeJan Arve Saether2012-12-161-10/+24
| | | | | | | | | | | | The crash could happen if a QWidget in the UI got deleted, and the AT client later tried to access the widget through the cache (qAccessibleRecentSentEvents()). Solution: Use a QPointer as a guard. Task-number: QTBUG-26187 Change-Id: I41eab158989fddfa147309b6bd91ac0cd1fe7b1a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Remove the timestamp info in genarated filesLiang Qi2012-12-153-10/+3
| | | | | | | | | | | | | | For moc, rcc and uic, then it's friendly for tools like ccache. ccache is using md5 to check file modification, but the different timestamp info will cause different md5 for same meaningful contents, it will disabled ccache. Updated the autotest for uic and rcc. Task-number: QTBUG-26589 Change-Id: I9e72ff022f722809b3f86bd9d7e0ae1e470e8eb2 (back port from qtbase/139f416237c52575b236c3b61e25796c83034567) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QUrl: make sure setAuthority is consistent with setHostPeter Hartmann2012-12-151-1/+4
| | | | | | | | | ... which is important for an empty but non-null authority. In Qt5 this is already working. Change-Id: I7d389037f71320c6f06897b220633311c3611eea Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QUrl: ensure toEncoded() matches toString() wrt. empty authorityPeter Hartmann2012-12-151-1/+1
| | | | | | | | | | | This was already fixed for toString() with commit 884f15e, this commit also fixes the toEncoded() implementation. In Qt5 this is already working. Task-number: QTBUG-8701 Change-Id: I0c81801e74d97de31632df45e52a25eb037b4710 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QPaintEngine: Fix build if compiled with QT_NO_XRENDERPeter Hartmann2012-12-151-1/+4
| | | | | | | | | composition_mode is only defined if QT_NO_XRENDER is not defined. Bug was introduced with 439aa67582e715ddc0ca7e30305b0c9498a71f81 "Fixes ignored composition mode in QPainter::fillRect with X11 engine." Change-Id: I2dc036ffa277cbf0f9327ede3fead9a407147fc0 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Modified vertical alignments of simple widgets on OSXTero Ahola2012-12-141-7/+7
| | | | | | | | | | | | | | | | Adding QCheckBox, QComboBox, QLineEdit etc. into an HBox layout or grid layout makes the layout look like a snake's trail. Fixed the positioning of these widgets to make the layouts visually more appealing. Updated qmacstyle auto-test accordingly. Task-number: QTBUG-13635 Ammended-by: Gabriel de Dietrich Ammended-by: Liang Qi Change-Id: Ic12346f764d8092292b8388f50d184b37d7cef5f (cherry picked from qtbase/8b6de4677142cab41790ca50ce6c7f1efbab5de8) Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mac: fix bugs for font selection in QFontDialogLiang Qi2012-12-142-11/+7
| | | | | | | | | | Use localized family name and style name when selecting font with non-English locale Task-number: QTBUG-27415 Change-Id: Ia10aaff50e1ffdb248c730fb46a8a66088ee64bb (cherry picked from qtbase/3c09f6bc9aee0c97427fe8da6efdc73b4ac473aa) Reviewed-by: Liang Qi <liang.qi@digia.com>
* Update defaultNumberingSystem value for some indic and slovak countries/regionsmfekari2012-12-141-19/+19
| | | | | | | | | | | | | | | | | Qt gets the information about locale digits from the <defaultNumberingSystem> entries in the CLDR data xm files. Current CLDR data in Qt4.8 is 2.0, which specifies native digits for most of Indic locales and arabic digits for slovak locale. This doesn't concern Qt5 that uses the most recent version of CLDR (22.1) which specify Latin digits for the locales in question. This patch updates the defaultNumberingSystem (to latin) and provides an autotest to compare the returned vs expected digits for the following langagues/regions: - Gujarati, Hindi, Kannada, Konkani, Malayalam, Marathi, Nepali, Punjabi, Tamil, Telugu (to use latin digits instead of native ones) - Slovak (to use latin digits instead of arabic ones) Change-Id: I04364cdb80292f7705b1321377623298a01a9c5b Reviewed-by: Vladimir Minenko <vminenko@rim.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Add missing fields for atomic classes in ARMv5 OABI.Tomasz Duda2012-12-121-0/+2
| | | | | | | | In commit Ib9ffcf0e26d3be36a0e158fd12a363b97177dcbf I forgot about two local fields for QBasicAtomicPointer and QBasicAtomicInt. Change-Id: I10637a4c85319ee16a8ea610840d31f331575267 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Specify better increment for captured propertiesAlan Alpert2012-12-113-4/+4
| | | | | | | | There aren't that many captured properties, decreasing the increment will give better performance. Change-Id: Iddb17c695eda5513f2d038123f4c886e559d8f6b Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Fix binary incompatibility between openssl versionsShane Kearns2012-12-113-1/+13
| | | | | | | | | | | | | | | OpenSSL changed the layout of X509_STORE_CTX between 0.9 and 1.0 So we have to consider this struct as private implementation, and use the access functions instead. This bug would cause certificate verification problems if a different version of openssl is loaded at runtime to the headers Qt was compiled against. Task-number: QTBUG-28343 Change-Id: I47fc24336f7d9c80f08f9c8ba6debc51a5591258 Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit eb2688c4c4f257d0a4d978ba4bf57d6347b15252)
* Fixes ignored composition mode in QPainter::fillRect with X11 engine.Samuel Rødal2012-12-111-2/+8
| | | | | | | | | It's not sufficient to check that the source brush has an alpha, there are composition modes that depend on the destination instead. Task-number: QTBUG-28499 Change-Id: I4b267544c607b6a68c4c52a6784d526bec604d75 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fix SSSE3 support build failure on mingwErik van Pienbroek2012-12-111-1/+1
| | | | | | | | | | | | | | | | Commit 94253f3472a13ac4eab3ccfbbba9d14165647f85 made QMAKE_MAC_XARCH to be set to 'no' for MinGW environments. Due to this change building for MinGW environments where SSSE3 support is available got broken. While building the imageformats plugin qjpeg4 the following error occurs: undefined reference to `_imp___Z32qt_convert_rgb888_to_rgb32_ssse3PjPKhi' This commit makes building Qt on MinGW environments where SSSE3 support is available working again Change-Id: Ib2a4b3cc244af8bdde70d2d2240c70ff0e7a4cc2 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
* Blackberry: remove JSON plugin reference from .proRafael Roquetto2012-12-101-2/+0
| | | | | | | | Remove a reference to blackberry.json from the Blackberry bearer engine plugin. This reference only makes sense under Qt5 Change-Id: I1592a17e38cb80b3fb138fc0538f3b4ea33739c8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix QWidget support on PlaybookRafael Roquetto2012-12-101-1/+29
| | | | | | | | | | | | The BPS version provided by the current version of the Playbook OS does not support orientation locking. This patch implements this manually. This patch is not needed in Qt5, since the API has changed. Change-Id: Ibba6fb3437cb392e3ba3d2b1997a178653226131 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* [QTBUG-27420] Make Q{Box,Grid,Form}Layout::takeAt() unparent a nested layoutMarc Mutz2012-12-093-5/+23
| | | | | | | | | | | | | | QStackedLayout doesn't have support for QLayout, only QWidget, so the issue doesn't arise there. (cherry-picked from qtbase/716d33d2a73ade42eb31be3e8ecbaeecdd5ddd21) (only change: s/reset()/clear()/ in the tests) Reported-by: Johannes Schaub Task-number: QTBUG-27420 Change-Id: I7f3c4b1996e954428c00d4dda1095712efa91367 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Disable graphic effects for widgets on Mac to prevent crashingAndy Shaw2012-12-091-1/+4
| | | | | | | | | Since graphics effects on widgets are not supported on Mac then the code is #ifdef'd out so that it does not crash instead. Task-number: QTBUG-24792 Change-Id: I4d81675b54816fa60cf66696b1a0a7b0206474e3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Bump Qt version to 4.8.5Sergio Ahumada2012-12-073-4/+4
| | | | | Change-Id: I7e991d4b1f7f3b5a51170e6ff09e293c4285ea26 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix for fullscreen resolution change on QWSKarim Pinter2012-12-071-2/+6
| | | | | | | | | Fix for QTBUG-27607. Now it handles the setMaxWindowRect for fullscreen widgets. It is called when the resolution changes with QWS. Change-Id: I0fdbb39c55f727b6507fbb14369943dd8b7c2d7e Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* fix uninitialized has_brush,has_pen in QOpenGLPaintEnginePrivateDon Hatch2012-12-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix probably-benign uninitialized memory reads of QOpenGLPaintEnginePrivate's member has_brush (if first call to updatePen() is before first call to updateBrush()) or has_pen (if the opposite). This makes the following error reported by valgrind 3.7.0 disappear: % valgrind --track-origins=yes --leak-check=no demos/composition/composition (press the "Use OpenGL" button) ... ==30137== Conditional jump or move depends on uninitialised value(s) ==30137== at 0x4C72CBD: QOpenGLPaintEnginePrivate::updateUseEmulation() (qpaintengine_opengl.cpp:2135) ==30137== by 0x4C76F2A: QOpenGLPaintEngine::updatePen(QPen const&) (qpaintengine_opengl.cpp:2145) ==30137== by 0x4C7708D: QOpenGLPaintEngine::penChanged() (qpaintengine_opengl.cpp:5416) ==30137== by 0x4C7C960: QOpenGLPaintEngine::begin(QPaintDevice*) (qpaintengine_opengl.cpp:1421) ==30137== by 0x5376BE7: QPainter::begin(QPaintDevice*) (qpainter.cpp:1881) ==30137== by 0x41B06F: ArthurFrame::paintEvent(QPaintEvent*) (arthurwidgets.cpp:149) ==30137== by 0x5223315: QWidget::event(QEvent*) (qwidget.cpp:8532) ==30137== Uninitialised value was created by a heap allocation ==30137== at 0x4A082CF: operator new(unsigned long) (vg_replace_malloc.c:287) ==30137== by 0x4C7736C: QOpenGLPaintEngine::QOpenGLPaintEngine() (qpaintengine_opengl.cpp:1234) ==30137== by 0x4C5171C: QGLEngineThreadStorage<QOpenGLPaintEngine>::engine() (qgl_p.h:939) ==30137== by 0x4C48E32: qt_qgl_paint_engine() (qgl.cpp:5333) ==30137== by 0x4C48E4E: QGLWidget::paintEngine() const (qgl.cpp:5345) ==30137== by 0x5376351: QPainter::begin(QPaintDevice*) (qpainter.cpp:1785) ==30137== by 0x41B06F: ArthurFrame::paintEvent(QPaintEvent*) (arthurwidgets.cpp:149) ==30137== by 0x5223315: QWidget::event(QEvent*) (qwidget.cpp:8532) ==30137== ... These members don't appear at all in the qt5 source, so I'm assuming this isn't an issue there. Therefore I'm submitting this fix directly, and only, to the qt 4.8 source, rather than putting it in qt5 first. (I wasn't able to get the composition demo program to exercise the opengl drawing code at all on qt5, so I can't say for sure whether qt5 is free of similar issues at this point.) Change-Id: Ic69beddd6e2c50b827140cb8790b40b9336c8f4e Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Clear focus of GraphicsItem focus scopes and their children.Andrew den Exter2012-12-051-3/+9
| | | | | | | | | | | | | A focus scope has effective focus if one of its children is the focus item, clearFocus() should remove effective focus from an item and its children not just from the focus item. Task-number: QTBUG-28328 Reviewed-by: Martin Jones <martin.jones@jollamobile.com> (cherry picked from commit ab97a44b6ae5cc826460f3704669383afd398594) Change-Id: Ib6f43b40091cb1bb1a0d5b8b9ac71e44f35b037b Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* QNX: Move buffer count check to appropriate locationRafael Roquetto2012-12-031-13/+13
| | | | | | | | | | | | The buffer count check should take place right after buffers are created. For some reason, the buffer count value inside libscreen may become incosistent during the course of the program. cherry-picked from qt5/qtbase 1b95d3331cb43fda36f92189ddce4e4c45bd47ea Change-Id: Id542b3f8633ce118b0c125d47f3eda63ca31fe5e Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
View Lorry Controller Status