summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use a UUID for the NSToolbar in unified title and toolbar.Jake Petroules2013-01-152-1/+29
| | | | | | | | | | | | | | | | | When two NSToolbars in an application share the same identifier, Cocoa tries to synchronize their state (item position, view mode, etc.), and this behvavior interferes with and crashes Qt applications in certain cases when toggling the unified toolbar on and off. Therefore it is necessary to use a unique identifier for each native toolbar created. Does not affect Qt 5. This functionality has been removed and an equivalent will be provided by QtMacExtras which uses a completely different approach, though I7d5c8d58e45a504480a1ce67065add15cb35ad8f could be considered Qt 5's rough equivalent to this. Task-number: QTBUG-19207 Change-Id: I9030d56941d12a2c1f7a328337bf986f1b51eeb8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix QVistaHelper::disconnectBackButton().Friedemann Kleint2013-01-152-1/+7
| | | | | | | | | | Restrict disconnect() to the clicked() signal, leaving connections to destroyed() (as used by QStyleSheetStyle) intact. Task-number: QTBUG-20292 Change-Id: I7471b4d1262ec0684e4446b5c17513717c502749 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/273713b81f5e580748c281c17e08e8b3e2e8ee70)
* Prevent a crash when hiding a window on Mac OS X 10.7 or laterAndy Shaw2013-01-141-0/+4
| | | | | | | | | | If a tool window is ordered out when there is a full screen widget around then it would cause a crash because of a new animation from Lion. This seems to be provoked by the fact that we are faking the fullscreen functionality in Qt. Change-Id: I07cdfddc6c2bb766df7809912fb97c4f1ba8873b Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Limit the range of the QUrlPrivate::port to -1 to 65535Thiago Macieira2013-01-142-1/+12
| | | | | | | | | | | | | The internal parser can read values outside this range (and cannot report an error), but QUrl::port() must not return something outside that range. The correct solution would be to report an error, like in Qt 5, but that cannot easily be done. The rewritten parser in Qt 5 is not affected by this issue. Task-number: QTBUG-28985 Change-Id: I3cf595384f14272197dcfb85943213c8f8ddeba0 Reviewed-by: David Faure (KDE) <faure@kde.org>
* QMenu: Fix nested popup when keyboard shortcut is usedOrgad Shaneh2013-01-142-1/+18
| | | | | | | | | | Task-number: QTBUG-20403 Change-Id: I2a5fe00dd16e9dc1ec0d742a8f48083fc2954996 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qtbase/b6963f109ad54c6f03b3391d57db9a536d49ba7d)
* QUrl::fromUserInput: fix for urls without a host.David Faure2013-01-142-2/+5
| | | | | | | | | | QUrl::fromUserInput("http://") was invalid, which doesn't make sense since QUrl("http://") is valid. Same for "smb:" which is actually even more a valid URL from a user's point of view. Change-Id: I371ac393d61b49499edf5adbbc2a90b426fe9e5d (cherry-picked from qt5 commit 8b2728ec382565c5bd57148600e34740a3c3fe52) Reviewed-by: David Faure (KDE) <faure@kde.org>
* BlackBerry: change SSL root cert folderPeter Hartmann2013-01-141-1/+1
| | | | | | | | | | | Currently /etc/openssl/certs is symlinked to /var/certmgr/web/user_trusted, but this will be changed in the future. /etc/openssl/certs is the folder to be used to read the root certs. (cherry picked from commit 4c8d8a72ec65f409394075ef50401265e495c1dd) Change-Id: I80820374586b5a9038e8b69206b6c9b05f486a07 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Check for gtk_adjustment_configure as this is not always implementedAndy Shaw2013-01-141-1/+3
| | | | | | | | | | | | | | Some implementations seem to not have the gtk_adjustment_configure function implemented so we check for this so that there is no problem when it tries to use it. Task-number: QTBUG-23569 QTBUG-25760 Change-Id: I777ce09268f86907f3da3cede408c9a41be566cf Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Karim Pinter <karim.pinter@digia.com> (cherry picked from qtbase/7fcf1cf674d09d9dd1d41e2913252017f1d599ca)
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1311720-11793/+11793
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Stabilize tst_QDeclarativeMouseAreaAlan Alpert2013-01-111-0/+2
| | | | | | | Adding qWaitForWindowShown removes a potential source of instability. Change-Id: I6dc6ef13762d897b387ca9bc15a8a1f49c05bdf2 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-102-1/+13
| | | | | | | | | | | | 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-102-2/+6
| | | | | | | | | 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-086-36/+98
| | | | | | | | | | | 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>
* Remove 'com.nokia' string from autotestAlan Alpert2013-01-0812-80/+80
| | | | | | | Change-Id: I01347645cedc6f4ecaf3158ea8336b0672ac9a4a Backport-Of: Ic318dbe7a48412e9689ca0f4506c7098d9f48b5f Backport-Of: Ic318dbe7a48412e9689ca0f4506c7098d9f48b6a Reviewed-by: Alan Alpert <aalpert@rim.com>
* Respect the OBJECTS_DIR setting for XCode projectsAndy Shaw2013-01-081-4/+2
| | | | | | | | | Task-number: QTBUG-28104 Change-Id: I0361cb979c40ce14ac163453d8229efc69527b6c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/eb2d0c82eb8842713f897c0de8c960d07e62df7d)
* Fix handling of precompiled header files in XCode projectsAndy Shaw2013-01-081-9/+4
| | | | | | | Task-number: QTBUG-24589 Change-Id: If81e15aa038f418abea25d96a7b7ec773a87d2db Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> (cherry picked from qtbase/3537ecfecb3dc8bf47261125395a3282455849c6)
* 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-083-37/+485
| | | | | | | | | | | | | | 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-072-2624/+2653
| | | | | | | | | | | | | | | 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>
* Fix QStyle-test for Windows Aero / 8.Friedemann Kleint2013-01-071-3/+29
| | | | | | | | | | | | | Increase tolerance on Windows for the Aero style. Set small top level widgets frameless to avoid warnings about minimum size of decorated windows on Windows. Task-number: QTBUG-28611 Change-Id: Ia4aec0cf0763da9955577054cb8cf81337fac134 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> (cherry picked from qtbase/34e60228d4d449f6ec9177e3ef731089db0fcef9)
* 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-055-0/+176
| | | | | | | | | | | | | | 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 tst_QImage on QNXRafael Roquetto2013-01-051-5/+5
| | | | | | | | | | This test is also run out of source under QNX and BlackBerry targets. This patch adjust SRCDIR accordingly by actually undefining it in QNX as well. This patch is not needed by Qt5. Change-Id: Ia8e43cd209d2876d5283f51b5717060992ed78ed Reviewed-by: Olivier Goffart <ogoffart@woboq.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>
* Skip failing testAlan Alpert2013-01-051-0/+1
| | | | | | Task-number: QTBUG-28830 Change-Id: If2313cf1536cd2209a92b5aee9a5980344b4f7eb Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Skip failing test for nowAlan Alpert2013-01-051-0/+1
| | | | | | Task-number: QTBUG-28829 Change-Id: If607130a936bd04fda8cc518f8b4cd8070e62c3c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* SSL certificates: blacklist mis-issued Turktrust certificatesPeter Hartmann2013-01-043-0/+58
| | | | | | | | | | | | 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>
* fix duplicate TRANSLATION entry in generated RC fileJoerg Bornemann2012-12-211-4/+0
| | | | | | | | Task-number: QTBUG-28625 Change-Id: I9bd6098c7557ca008211acef172f5c51a6766998 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit 3e94e8daf36e90e73ca475a81c9b9a3af40b45b3)
* tst_qaccessibility: Fix warnings about window geometry on Windows.Friedemann Kleint2012-12-201-0/+19
| | | | | | | | | | Make windows frameless so that size constraints for decorated windows do not interfere. Task-number: QTBUG-28696 Change-Id: Ic4410d8a6e8166bdfe013ed2362173f8e02d4b29 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> (cherry picked from qtbase/a0584f678b20103fe4ccbe482848051acbb00b21)
* changes-4.8.5: Fix wording about merge request and fix linksSergio Ahumada2012-12-201-5/+3
| | | | | | Change-Id: Iecc74cc9126b279d12c2938f7649e25f6c6e463f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
* 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>
* QMdiArea: Increase minimum size for Windows 8/Large fonts.Friedemann Kleint2012-12-191-2/+2
| | | | | | | | | Task-number: QTBUG-28611 Change-Id: I115a5fa6726ac99c2bbff4ec65d3f8856b2530df Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> (cherry picked from qtbase/3e3451f42989a0dbd2398da78ad84441c7898fd3) Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* QMenu: Do not set snapToMouse if a caused-widget exists.Friedemann Kleint2012-12-192-5/+37
| | | | | | | | | | | | | 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-193-15/+450
| | | | | | | | | | | 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>
* accept hex/octal values for RC_LANG and RC_CODEPAGEJoerg Bornemann2012-12-181-1/+7
| | | | | | | | Task-number: QTBUG-28624 Change-Id: I6188045b05ebb8b9d285d1b30f8082a2fe46ff8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit f0f12ea5f1b6fdaf3e2e38bf8d814dfa41cbca5b)
* Use frameless widgets in tst_qgridlayout.Friedemann Kleint2012-12-181-2/+31
| | | | | | | | | Avoid failures caused by minimum window widths on Windows Areo/8. Task-number: QTBUG-28611 Change-Id: I9affcce84ab804a45fa1a12fb93ad0136e6ae877 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> (cherry picked from qtbase/d5d79f3c7f9e597cb63dfa8a9ccfb9dca733a782)
* 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>
generated by cgit v0.12 at 2024-11-25 12:42:14 (GMT)