summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* Blackberry: implemented "orientation lock" widget attributeBernd Weimer2012-10-201-0/+14
| | | | | | | | | | | | Qt::WA_LockPortraitOrientation and Qt::WA_LockLandscapeOrientation will be adhered to. This is not needed in Qt5, as those attributes have been removed from Qt5. Change-Id: I5f29cad0e2c784caa6201b683d7b658a5b0d083d Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Close popups on non-client area mouse press.Morten Johan Sorvig2012-10-191-0/+11
| | | | | | | | | | | | | | Fixed QComboBox popup issue which was left open if window was moved(dragged) to another position. Task-number: QTBUG-1894 Task-number: QTBUG-26120 Task-number: QTBUG-26465 Task-number: QTBUG-26827 Change-Id: I7e37b37881cdf94574d79f7e77d36f5bbc15f732 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Make QtDBus work again with D-Bus 1.0 and 1.1Thiago Macieira2012-10-192-22/+9
| | | | | | | | | | | | The dbus_get_version function was introduced in 1.2, so we'd need to detect pre-1.2 by the absence of the function. But if we're going to detect the presence or absence of any function, we might as well do it on dbus_connection_can_send_type, which is the function we wanted anyway. Change-Id: I6e17a3a8f1382c6a489490084f6e3f61aa5a1947 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from qtbase/0510fc149e0c6b955ee9b93917e72ee378369197) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* GL Window needs to update after an orientation changeBernd Weimer2012-10-181-0/+1
| | | | | | | The qnx plugin in Qt5 is different, update is not needed Change-Id: I70cf6a0b091bd1f15795521397eb744401aff2c8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix a regression with regards to hfw behavior in QStackedWidgetJan Arve Saether2012-10-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a regression because we made QStackedWidget actually support heightForWidth in 4.8. This was done with change 4780f94e391b5e881497c5228661dead42c821fa. The problem was that heightForWidth was not calculated correctly because some of the pages were hidden. The hidden pages were actually not contributing to the hfw of the QStackedWidget at all. This again caused the QStackedWidget to change its heightForWidth() value when the current tab changed, which again could cause "jumps" in the UI when switching tabs (as demonstrated in the task). The problem was that the patch relied on calling QWidgetItem::heightForWidth(), and this function would return -1 if the widget was hidden. However, QWidget::heightForWidth() does not have this magic and returns the proper hfw value regardless of its visibility. One could argue about the correctness of this patch, but since QStackedLayout::sizeHint() disregards QWidgetItem::sizeHint() (it asks the widget directly), we do the same in QStackedLayoutHFW::heightForWidth() for consistency. In addition, QStackedLayout enforces that only widgets can be added to it, and you cannot add your own QLayoutItem subclasses to it: qWarning("QStackedLayout::addItem: Only widgets can be added"); Change-Id: I0196a9e8e3ef3a36ce0e1a2929dfd58edeb93c69 Task-id: QTBUG-24758 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix Drag and Drop with Native WidgetsJian Liang2012-10-181-1/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-27265 Don't check "dragOverWidget != widget" in QOleDropTarget::DragOver() because if the dropsite widget's parent widget is the drop target this check will prevent its parent widget receive drag over event and the dnd cursor indicator is also wrong. We replace the check with "!dragOverWidget->isWindow()" to prevent pass through a window. A similar issue in Qt5 beta has been fixed by https://codereview.qt-project.org/#change,35646 Change-Id: I9e18b71bd7f3ee244db61571811c51dc16b341d2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Blackberry: Populating the QCoreApplicationDataFabian Bumberger2012-10-181-0/+47
| | | | | | | Backport of: 49f277482e86d21edf9a055229100486aaf8b4c0 Change-Id: I7549834efc86f834d549c9a4278f693a29b7ee11 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Blackberry: Emit aboutToBlock() and awake() correctly in the dispatcherThomas McGuire2012-10-181-7/+31
| | | | | | | | | | | | | | On Blackberry, select() can actually temporarily wake up to process mative BPS events. Make sure to emit the aboutToBlock() and awake() signals in this situation accordingly. This is a backport of qtbase commit a1082dbc3f61f1747bd756f8fce2a54f558793ed Change-Id: If1bd1c300b037cb5dac1c96c68abbfb22188dd34 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* QNX: Add and remove screens dynamically.James Turner2012-10-184-17/+90
| | | | | | | | | | | | | Backport from Qt5: Watch for display events from libscreen, and dynamically add and remove QPlatformScreens (and hence QScreens) in response. Qt5 commit: 1f0d430c3a660c9e72581b582fe16c440bcf9eac Change-Id: I65f69fc9eca5b32b0aa0e929d09837a6f01385d0 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* BlackBerry: Use real DPI instead of hardcoded valueKevin Krammer2012-10-171-16/+53
| | | | | | | | | | | | | | | | | | | | | Try to retrieve the device's real screen size and provide override options in case the target's low level stack reports wrong values. It can happen that the system is reporting a screen width or height of zero, if the system does not know the size instead of returning an error. You can either set a define QQNX_PHYSICAL_SCREEN_WIDTH/QQNX_PHYSICAL_SCREEN_HEIGHT or set it as environment variable QQNX_PHYSICAL_SCREEN_SIZE. The preference order is: 1) Take detected size 2) Take size from env var 3) Take defined size if any define is set Backport of 0b0e28997d5c0ec6fbffa839b0ceb57b55104f9c Change-Id: If24a5d32ec9081fe006344bf30bbb917418c9071 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed cosmetic line drawing where begin and end points are equal.Samuel Rødal2012-10-171-0/+5
| | | | | | | | | | | This case has typically required specific work-arounds in other rendering paths as well. (cherry picked from commit dfb55f8a6c8d3ec4da840191c331ace3c2aa2bf3) Task-number: QTBUG-25153 Change-Id: I217e710a30222792ebca3bf297e438d944c32992 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QComboBox: mention insert policy in context of editable propertyMark Brand2012-10-171-1/+4
| | | | | | | | | This makes it a little bit easier for the reader to discover what editable combo boxes are about. Change-Id: I60ce571f01e32d4cacb4718b42a8e12884bd1c13 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> (cherry picked from qt5/qtbase commit a5e7c2802af59d4940e3479288cb9346205b984c)
* QtSql: Correct documented default precision policy.Mark Brand2012-10-171-8/+4
| | | | | | | | | | Follow-up to commit c9f77564df14f91276e9ca693a9b3f339dab9334 Task-number: QTBUG-27482 Change-Id: I17c12ee14d4609bccbe67bba2581f13d72c069ae Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qt5/qtbase commit 7a34e88edcc8b05744cede732f79f99acaad75ef) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* correct spelling in QtSql documentationMark Brand2012-10-171-1/+1
| | | | | | | Change-Id: I69e4178bbe967a70b1141122639883b5cbacd924 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Bill King <bill.king@nokia.com> (cherry picked from qt5/qtbase commit f8cfb4bebd331ca950511570d141c5ec9172c7e6)
* QComboBox::currentText: correct documentationMark Brand2012-10-171-3/+6
| | | | | | | | | | | | | | The documentation previously neglected the fact that the current text can be provided by the embedded QLineEdit if the combo box is editable even if there is no selected item. Change-Id: If40868c1633af7ce81b437d29e1da3fd4fefafb0 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Adam Light <aclight@gmail.com> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qt5/qtbase commit 8d56ed85bdce40bca7b8457527103988efb3afcd) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Mangle QNSApplication and methods into a namespaceYan Shapochnik2012-10-152-13/+16
| | | | | | | | | | | Ensure Qt's native implementation of sendEvent: calls the proper Qt event filters and passes them along to the correct QApplication instance thus guaranteeing that macEventFilter() is properly called when a non namespaced and a namespaced Qt exists in one process. Change-Id: I61543d6ef68b09cfb40c9d263aaaf5ead5ece24b Reviewed-by: Yan Shapochnik <shapochniky@seapine.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Mangle QNSApplication into a namespace when Qt is configured as suchYan Shapochnik2012-10-153-3/+3
| | | | | | | | | | | | | | Ensure the correct QNSApplication is referenced when multiple Qt instances exist in a process. This will also prevent the following messages from being displayed in the console "Class QNSApplication is implemented in both /path/to/QtGui.framework/Versions/4/QtGui and /path/QtGuiNamespaced.framework/Versions/4/QtGuiNamespaced. One of the two will be used. Which one is undefined. Change-Id: I22e7f06aa35e9daecf2e9c881268baf92d35022c Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Prevent an overflow warning in assertions.Christian Kandeler2012-10-143-7/+7
| | | | | | | | | | | | | | | | | | | Functions like QByteArray::at() assert the given index: Q_ASSERT(i >= 0 && i < size(); These functions typically get inlined. Now if the index is e.g. size() - 2, then gcc will emit an ugly warning in client code ("assuming signed overflow does not occur when assuming that (X - c) > X is always false"). This can be easily prevented by casting both sides of the second comparison in the assertion to their unsigned type. The explicit comparison to zero is then no longer necessary, since that condition is tested implicitly by the other comparison due to unsigned arithmetic. Change-Id: Ic7244e1fa5da00a47d1fe0ed56fb81c23d444dfe Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from qtbase/8e90e0805f2981014d3382d8841617b4c56dfc50)
* Blackberry platform plugin: Open locale object read-onlyPeter Hartmann2012-10-141-1/+1
| | | | | | | | | | We only use that PPS object for reading. In Qt5 this file is not used anymore. Change-Id: Ibdfd74f7b7a065ade45b275cb12dd67ddecd0736 Patch-by: Nick Ratelle Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Implementation of the BlackBerry Qt Proxy support.Andrey Leonov2012-10-143-0/+138
| | | | | | | | | An implementation for BlackBerry devices based on the BPS netstatus API. (backport of qtbase/cf66e41728ae70595365833c9ed00d0e2e6c4200) Change-Id: I155f287274c4d92e0546740b8dbe595ea030b505 Reviewed-by: Peter Hartmann <phartmann@rim.com>
* Fix number of available printers in CUPS supportNick Ratelle2012-10-141-1/+2
| | | | | | | | | | | | | | | | | | | | | If available printers in CUPS support. If the number of available printers changes, we want to update the count. Additionally, if that number has gone to zero, we want to ensure that the number of available printers in the static object is reset to zero. This fixes a crash that occurs if: * You print * You kill cupsd (or it crashes because you're porting it and your port is * unstable) * You try to print again before restarting it. cherry-picked from qt5/qtbase eda0e120e9e2e7b7be747f4ed035d686c9547769 Change-Id: If4640045073acaecec4495f5cb01806ae859cf65 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix access to uninitialised memory that might lead to crashesThiago Macieira2012-10-131-0/+5
| | | | | | | | | | | | | | | QMetaObject is POD, so its constructor is implicit and trivial (doesn't initialise anything). QAbstractDynamicMetaObject doesn't add a constructor, so the QMetaObject sub-object remains uninitialised. The users of either class must ensure they initialise the members if they will be accessed. Task: QTBUG-23214 cherry-picked from qt5 95cb2a1b5caf7d7158dd1176380c1458ea22b54f Change-Id: If0e6b129e1bddc3b70feafa4b318280bb715ab04 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Enable NEON compilation on qcc compilers.Rafael Roquetto2012-10-131-1/+1
| | | | | | | | | This change does not apply to qt5. Change-Id: I0d9b9cc39270a377b8f6f8289ad1fd7a05dd0367 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Pass NEON_ASM directly to SOURCES.Rafael Roquetto2012-10-131-3/+2
| | | | | | | | | | | This guarantees that qmake gives them the proper flags (non C++) while building these asm files. cherry-picked from qt5/qtbase 1ef74a763a726829bfc26224d82acff207fdc8bb Change-Id: Iec8dbb2d25700ead99d46b054665b817bbe79b7b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QDeclarativeTrace patch for a custom trace instanceFrantisek Vacek2012-10-125-4/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for the BB10 Cascades profiling. There are more reasons for introducing this patch: 1) Cascades do not use QtGui library for QML rendering. It has its own paint engine with client-server architecture. Profiler traces are sent asynchronously from non Qt renderer thread to the Qt client. The QPerformanceTimer has to be patched too, cause we need to know time difference between tracing zero time and some time in past, see: qint64 elapsedToAbsoluteTime(qint64 absoluteMonotonicTimeNs) const 2) Since we need more sophisticated trace engine in cascades, this patch allows explicitly assign custom class derived from QDeclaraqtiveDebugtrace to the trace framework. If no custom instance is assigned, the default QDeclarativeDebugTrace instance is created implicitly on first trace request. Using custom trace instance which is not part of Qt (it is part of libbbcascades) allows us to implement all Cascades trace special needs in libbbcascades and not to carry Qt with the platform specific code. 3) The NO_CUSTOM_DECLARATIVE_DEBUG_TRACE_INSTANCE macro is introduced to allow custom trace engine only on the bleckberry platform, see declarative.pro. If this macro is defined Qt compiles from its original code. 4) Possibility of custom QDeclaraqtiveDebugTrace instance might be usable for other projects which needs to extends somehow default Qt trace functionality. 5) Patch is not intended to be applied to Qt Quick 2, since declarative debugging infrastructure is changed there. (cherry picked from commit f13b52f25c1e0bc26dcf3ea304b3495f7d5cd370) Change-Id: I199211c1de66e930e252e8c033503d7f4940565f Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Introducing the PlatformPanel event type.Sergio Martins2012-10-128-5/+41
| | | | | | | | | | | | | | | | | This event can be used by any platform plugin to implement special application panels/overlayed menus. Currently used by QNX only. This replaces sending fake Qt::Key_Menu presses in the QNX plugin. Qt::Key_Menu is already used when invoking context menus with the keyboard. ( backport of qtbase/9695df4d44b228e7e778ff17d5cccac30967b1fd ) Change-Id: Id5cf96758f1104f454a2bb977b367d09d4685b62 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* QNX: Fix crash in QBBNativeInterface::nativeResourceForWidget()Thomas McGuire2012-10-121-1/+2
| | | | | | | | | | | | This was triggered by using a QVideoWidget without a parent. This patch is not necessary in Qt5, as the API there is based on QWindow, it has no call to nativeParentWidget(). Change-Id: I2fe2b872da314e507bcfcb69dfea4a837700ac71 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Add Proxy Auto Config support (PAC) on MacDaniel Molkentin2012-10-122-5/+113
| | | | | | | | | | | | | | Adds support for fetching and parsing Proxy Auto Config files if one is specified in the Mac System Preferences Task-Number: QTBUG-2069 Task-Number: QTIFW-28 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit c524bbbb8aa4ba10bac68292a3078534f1b51df5) Change-Id: Iad8fa2a7517f9254e9c9a3c573bec0f7f4df0dfb Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fixed potential crash in wglCreatePbufferARB() on Windows.Samuel Rødal2012-10-121-2/+3
| | | | | | | | The spec doesn't allow for the piAttribList parameter to be 0. Task-number: QTBUG-27331 Change-Id: I75da84789cf8044e9283bbab29b6435b0d352f22 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix QObject::receivers() within connectNotify()Thomas McGuire2012-10-122-1/+7
| | | | | | | | | | | | The receiver count needs to be correct in connectNotify() to be compatible with ordinary connections. Fix this and add test. This is a backport of qtdeclarative commit b1c6e095404ccb7788e6b12fff692c71f4900815 Change-Id: Ic3145a536c928eccfcc29b4d010a526135b654b0 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Use QVarLengthArray when creating the connectNotify() argumentThomas McGuire2012-10-125-14/+27
| | | | | | | | | | | This gets rid of the heap allocation of the QByteArray. This change is not needed in Qt5, as there, QMetaMethod is used as the argument, and therefore there is no need to construct a SIGNAL-compatible string in memory. Change-Id: Ie2023aeb99bc8f792d437ec604e9989a5efe456b Reviewed-by: Alan Alpert <416365416c@gmail.com>
* QNX: Fix input lagThomas McGuire2012-10-121-0/+8
| | | | | | | | | | | We were breaking out of select() too early with a timeout of -1. This is a backport of qtbase commit ba8f3002d49d9941b2991fbe4d78883ea59827b2 Change-Id: I65e534caea665fea3d99de621bcdbcf7c47fac55 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QNX: Remove workaround for BPS bugThomas McGuire2012-10-121-25/+6
| | | | | | | | | | | This BPS bug has been fixed with the latest BB10 release. This is a backport of qtbase commit 4a755752e919b8a6d68bea265c16c44b90eeb545 Change-Id: Ifa9fb9efd8c12aef6e554f5bf7a731fdf983f83d Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QNX: Remove the busy loop work around for bps ignoring timeout bugSean Harmer2012-10-121-21/+41
| | | | | | | | | This is a backport of qtbase commit b72904e8540e4aa1f1396893f5d1b216d745cdc3 Change-Id: I7489dc69fa505e76f707531e70a8011d596da19d Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* Clean up whitespaceJan-Arve Saether2012-10-121-34/+34
| | | | | Change-Id: Id1e293352d90a151e31ba73168400aacebc588dc Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* qpa: Fix rendering issue in blitter paint engineJulien Brianceau2012-10-121-3/+4
| | | | | | | | | | | Take into account brush transformation for TexturePattern fill. Example : arrows are not rendered properly in http://www.youtube.com/leanback website. cherry-picked from qt5/qtbase 2f2656002735a14687c5d6b5a3250666a8e102e3 Change-Id: I11fead281e372b2a24da835f85c327879e9997f0 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Changed Qt release version to 4.8.4jutaipal2012-10-083-4/+4
| | | | | | | Change-Id: I45f7894f7e79617b6ccb8caa464bbbffaf9dd7b5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix error when inserting to tables with datetime fields with QODBCThiago A. Correa2012-10-081-4/+42
| | | | | | | | | | | | | | SQL Server 10 introduced stricter rules for TIMESTAMP validation, making it necessary to specify the decimal digits. Other databases might do the same as well, so this patch introduces a check for the TIMESTAMP column size and adjusts the decimal digits parameter as needed. Task-number: QTBUG-2192 Change-Id: If6d798c6c928ebda75bc474e49a07fbbfbe5816c Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qtbase/b8b79a0f37ec74fd5b4ad829e522a384ba3622ae)
* Register Qt 4.7 import on-demand, instead of at startup.Robin Burchell2012-10-049-19/+58
| | | | | | | | | | | | | | | | | | This is a slightly less awkward approach (keeps backwards-compatibility) while speeding up startup for applications that don't use the old import path. Also prints a warning to let developers know they should migrate their code when possible. Completely disabling the Qt 4.7 import is still possible by setting QT_NO_IMPORT_QT47_QML. This takes around 10-15ms off a very simple "hello world" on my macbook. (backport of qtquick1/2a3e9eb0ba00acf30b9cc40f7e2e4347726fb6b4) Change-Id: I6960e7c28bb4f153d793802b978c1944977e8ed4 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fixed text drawing in OpenGL 2 paint engine.Samuel Rødal2012-10-031-2/+1
| | | | | | | | | | Regression introduced in 0aa9b30432cec3b7. Partial backport of 12590582a2f676912690 in Qt 5. Task-number: QTBUG-24453 Change-Id: I9522cff661849981096d4efe70164841739ff359 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Update the state of native menus correctly on MacPasi Matilainen2012-10-023-12/+7
| | | | | | | | | | | | | | | | | | | | | The state of native menus is currently updated in two incompatible ways on Mac, either by updating the state of native menu items in a native menu (when setEnabled is called) or the state of the native menu item containing the native menu (when the menus are initialized and when a modal dialog is opened/closed). This causes various problems, e.g. inability to enable a menu that was disabled before menu initialization or menus getting enabled incorrectly after a modal dialog is closed. Fix by always setting the state of the native menu item that contains the native menu. Also, autoenable is active for the main menu, resulting in unnecessary menu validation calls, so turn it off. Task-number: QTBUG-25544 Task-number: QTBUG-26399 Task-number: QTBUG-7538 Change-Id: Iab335af633604e7b3017eaa55464d1b8fdd7b821 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* QNX: Only set parent window if it is not NULLRafael Roquetto2012-10-021-1/+1
| | | | | | | | | | | | | | | There are cases where a widget has a parent, but is also a toplevel window at the same time, causing the system window to have no parent. For instance, a QMenu usually has a QMenuBar as a parent, however QMenuBar itself does not have its own platform window, as opposed to QMenu. Thus QMenuBar::parent == QMainWindow (for example), but QMenuBar::platformWindow == 0x0; QMenu::parent == QMenuBar, but QMenu::platformWindow != 0x0 (which is QMenuBar's value). cherry-picked from qt5 04d296d64118ba2d647668494872d93cc1ef7ed1 Change-Id: I9304c5c9e64dca012a1903de7c80c168a701a5ea Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QNX: Fix bug on window hierarchy listThomas McGuire2012-10-021-8/+6
| | | | | | | | | | | | removeFromParent() must not be called from raise()/lower(), because it wrongly sets m_currentParent to 0, causing the parent/child link to be broken after a call either of these methods. This is a backport of qtbase commit 4c33efc3228d82a82e13fe8c196b8c74a4998572 Change-Id: I5970cd2b2e0d58ef01dd99c10748195220d0e006 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Support input method hintsThomas McGuire2012-10-023-4/+23
| | | | | | | | This is a backport of qtbase commit d162f276714f04b07827dfd525deea45dc55a5f1 Change-Id: I3ae3994d305eebd61773e175332cecfa1d9cde51 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 12:53:07 +0000