summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Prevent touch coordinates outside target geometryMikko Harju2013-06-051-3/+4
| | | | | | | | | | | | | | | | | | | | Previously, normalized positions with either of coordinates equal to 1.0 would be reported outside the screen / window geometry, which would cause hit test to fail. Change-Id: Ia5e083bd52254c7e05143eedf930be3bcba7a412 Initial-patch-by: Aaron Kennedy <aaron.kennedy@jolla.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Fixed raw coordinate reporting for touch eventsMikko Harju2013-06-051-0/+2
| | | | | | | | | | | | | | The raw coordinates were not reported by the evdevtouch plugin. Change-Id: Ia06129edd771b12cc9f6a97dc678b545d226af70 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Fix typo in QAlgorithms documentation.Mitch Curtis2013-06-051-1/+1
| | | | | | | | | | Change-Id: Ic9107f427acc1e009779d39e0a204ea81d54aee7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix FBO restoring in QOpenGLTextureGlyphCacheValery Volgutov2013-06-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLTextureGlyphCache::restoreTextureData restores FBO which was binded before restoreTextureData call. More specifically, it restores QOpenGLContextPrivate's current_fbo member. This works if FBO was binded by QOpenGLFramebufferObject but not if FBO was binded using glBindFramebufferObject and rendering done via QOpenGLPaintDevice. This patch fixes it by querying current FBO using GL_FRAMEBUFFER_BINDING query and restoring it. Change-Id: Ia97a21e62566dc39a5191b66d3ca0e3ad0845ce1 Reviewed-by: Valery Volgutov <valery.volgutov@lge.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Prevent negative size in QBitArray, QVector and QVarLengthArray ctors.Mitch Curtis2013-06-053-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As shown in QTBUG-24345, QBitArray will exhibit invalid reads when initialised with a negative size and run under valgrind. QVector and QVarLengthArray both cause a crash if initialised with a negative size. This patch enforces sizes greater than or equal to 0 with asserts and existing if statements, and hence impose no performance penalty for release builds. Task-number: QTBUG-24345 Task-number: QTBUG-30037 Change-Id: I9a969f6016e0a59904a60bbfe9e5360e6f523b87 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Changed project dependencies for solution filesAndrew Patterson2013-06-051-17/+27
| | | | | | | | | | | | | | | | | | | | Reorganized project dependency output in solution files for vc 2005+ Task-number: QTBUG-30993 Change-Id: I4764f3d98be40b3e217130522bb89a43bbf3669e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Use the GCC inline assembly when building for MinGWThiago Macieira2013-06-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | MinGW has a longstanding problem of providing the MSVC intrinsics that every Windows developer expects to be there. Other projects have run into those problems. So instead just use the GCC inline assembly. Change-Id: I5651f97f9a4dfbf98ebbf063f91f221eab80b224 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Fixes QKeyEvent::count() on Windowsaavit2013-06-041-7/+7
| | | | | | | | | | | | | | | | | | | | | | All other main platform plugins leave the count parameter at its default value (1). For improved compatibility, make the Windows plugin do the same, instead of hardcoding the value to 0. Task-number: QTBUG-31285 Change-Id: Id87fd559d13f42391be3200d5ff2393285f0d2a6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
* | QDnsLookup: test multiple TXT answers tooThiago Macieira2013-06-041-48/+54
| | | | | | | | | | | | | | | | | | | | | | | | The TXT record is particular because each RR can contain multiple text strings. So we need to join each RR's texts too. To make it easy, I've made everything be QStrings. Change-Id: Ia0506544b913585e7be860c81077cff8e0dab547 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QDnsLookup: test MX and SRV records that can change orderThiago Macieira2013-06-041-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DNS protocol changes the order of the RRs in each reply it sends, in an effort to balance the load in servers. For most tests, to ensure that we get always the same result, we simply sort it back. For MX and SRV, we can't sort because we also need to test that QDnsLookup sorted correctly according to priority. So instead allow that test to have multiple alternatives. Change-Id: I5c119f907b31789de5c9cf2471cc82ecd140d06f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Mention QRect's int min/max constraints in detailed description.Mitch Curtis2013-06-041-0/+6
| | | | | | | | | | | | | | Task-number: QTBUG-25732 Change-Id: If330768c3075568f09593ed17f26389d3dec3335 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Make qtbase compile with QT_NO_TEMPORARYFILETasuku Suzuki2013-06-0413-8/+79
| | | | | | | | | | | | | | | | Change-Id: Ida2f59bb245ef70bf65f7e8944c4c315d5bc2f81 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix broken build when using OpenSSL 0.9.8Scott Deboy2013-06-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Resolving compilation issues encountered when dynamically linking to OpenSSL release 0.9.8 (no letter) Adding #ifdefs to address OpenSSL version issues, correcting q_sk_push declaration Conflicting code in qsslsocket_openssl.cpp not present in stable branch. Task-number: QTBUG-30615 Change-Id: I4b86ca4303343cca5d440ab9821b275028cc5a72 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | Fix typoFrederik Gladhorn2013-06-031-1/+1
| | | | | | | | | | Change-Id: I0983f12759fdb806e4fc89f4abefb9088502208d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-06-0338-143/+121
|\ \ | | | | | | | | | refs/staging/stable
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-05-3138-143/+121
| |\| | | | | | | | | | Change-Id: I0a8fe79a80b7720f76e3c0b03cc2c9a769d4009b
| | * Use [NSEvent characters] to retrieve the input character.Gatis Paeglis2013-05-301-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is how it was done in Qt 4. An issue with the current approach was that it did not consider modifiers when setting a Qt::Key_* value, which would assign the same Qt keycode for: a = a(65) Alt + a = ā(65) [here it should return a unicode value for 'ā'] This is inconsistent with the other platform plugins. Also in the combination with a dead keys it was returning nothing in the output. Task-number: QTBUG-29005 (cherry picked from commit 6730413fcac1d7eb39af3683b87f965c5823cb6c) Change-Id: Ic28eb55b3a9798ecb6012cc2e3fb18589b8b0392 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Mac style: Remove yet another reference to widgetsGabriel de Dietrich2013-05-301-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I545cfe22c6307864cdb18093a37e09a8ad042347 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * Fix tst_qtendian autotest build for WEC7.Janne Anttila2013-05-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC2008 compiler fo ARM targets fail to compile qToUnaligned when using sizeof(T) inside memcpy fynction. The compiler fails at least when the code is reached through the following macros and templates: -> tst_QtEndian::toLittleEndian -> qToLittleEndian(T src, uchar *dest) -> qToUnaligned(const T src, uchar *dest) The above sequence produces internal compiler error with MSVC2008/ARM builds when called from tst_endian. As a workaround sizeof(T) is called outside memcpy function. Change-Id: Ib4d382c2cebecb6e54bb99fc8fad72db93825fcd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Windows: Suppress mouse events synthesized by OS.Friedemann Kleint2013-05-302-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the hint for QPlatformIntegration::SynthesizeMouseFromTouchEvents to false for Windows and suppress the events synthesized by OS. The synthesized events cause touch events to generate 2 clicks in Quick2. Leave code as is for Windows CE. Task-number: QTBUG-31386 Change-Id: Ia0987342dcdd55c8540810da5e4b90518a501ce6 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Move QBasicDrag and QSimpleDrag to QtGui.Samuel Rødal2013-05-3012-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are useful as default implementations of QPlatformIntegration::drag(), instead of having it return 0 which will lead to crashes in Qt Quick 2 and widgets applications that use drag and drop. Task-number: QTBUG-31288 Change-Id: I70efa139306ced5d879def0f74e3a72d3bcd64f7 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
| | * fix PlatformToolSet tag location in vcxproj filesJoerg Bornemann2013-05-301-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PlatformToolSet tag belongs into the PropertyGroup with the label "Configuration". The former location in an anonymous PropertyGroup tricked Visual Studio into displaying the right PlatformToolSet but using its default value. If VS 2010 and VS 2012 are freshly installed on the same machine, the default toolset for VS 2012 is VS 2010. Task-number: QTBUG-30822 Change-Id: If00a532e92b0812c552b1cac52ff77a1e7039146 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Disable precision timers when running MSVC2012 code on pre-Windows 8.Friedemann Kleint2013-05-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Precision timers can cause the event loop to lock up when running MSVC2012 code on pre-Windows 8. Task-number: QTBUG-27266 Change-Id: Idd73731e82843d0d140859bab825bc1a54eccf1a Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * qdoc: Handle collision nodes when building index filesTopi Reinio2013-05-302-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently qdoc skips collision nodes (and their children) when reading index files. This means that cross-linking between modules does not work for nodes that are defined under a collision page node. Most notably, the QML global object 'Qt' cannot be linked to from outside Qml module as it collides with Qt namespace. This change fixes the issue by skipping collision nodes and only processing their children when writing index files. In addition, we need to adjust the function that searches for nodes to the possibility that there may be multiple nodes with the same name but different type. Task-number: QTBUG-31096 Change-Id: Ic71d714f85539d8537021c73d8f1a527006a6f23 Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * remove bizarre perl detection magicOswald Buddenhagen2013-05-301-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the code makes no sense, and was added with the QNX port without comment. there is already a detection a few lines up. Change-Id: I18ec18604c37c7c42f2649a658dd22324d481dd3 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| | * QMenu: Remove last references to QMacWindowFaderGabriel de Dietrich2013-05-304-44/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was never ported to Qt 5, and 10.7 has simple API for that. Task-number: QTBUG-31336 Change-Id: Ie00c4ed3af9cd098c9e63eba1c654f1801aa83aa Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Cocoa: Allow delayed title setting in menu itemsGabriel de Dietrich2013-05-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what happens in uic generated code. Therefore, we should not mark an item as text-synced until it's got its text set. Task-number: QTBUG-31378 Change-Id: I7bb7db8abad922b50546c7669d285369ebf01394 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Cocoa: Hide empty menus from the menubarGabriel de Dietrich2013-05-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31378 Change-Id: I33ab2979a26166fb07e836c85dfc8089af5e1fda Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * qdoc: "All Overview and HOWTOs" no longer lists internal pagesMartin Smith2013-05-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This page is generated by a function in qdoc that was wwrriten especially for this page. It wasn't checking to see of the group member pages were marked with \internal. Now it does. Task-number: QTBUG-31197 Change-Id: If3f0e90f1a3748c47b3975373047b04d011d6748 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * qdoc: QML property lists were not shownMartin Smith2013-05-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For grouped properties, the property list in the summary section was not shown owing to a bug introduced when implementing the abstract base class concept for QML types. This has now been fixed. Task-number: QTBUG-31317 Change-Id: Idc2344539ecf3da53e1be6816f59e01922c5c6fc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Disable "QBackingStore::flush() called with non-exposed window" warningSamuel Rødal2013-05-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This warning is pretty annoying and doesn't necessarily imply that an application is not working properly. Task-number: QTBUG-28613 Change-Id: Id0a2ebd91f9e4d59dce3e3e29637988d8e6175a9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * Fixed crashes in QGLTextureDestroyer.Samuel Rødal2013-05-292-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLTextureDestroyer will try to make the context current on the GUI thread, regardless of whether it is owned by another thread. Use QOpenGLSharedResourceGuard instead which does the right thing and takes shared contexts into account. Task-number: QTBUG-31403 Change-Id: I1377f9284995a7ba5af32c85296eef152fc035c8 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * Fix QPlatformWindow::initialGeometry() to not touch large windows.Friedemann Kleint2013-05-282-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not touch windows whose geometry (including the unknown frame size) is likely to be larger than the screen. Remove fix-up in the Windows plugin. Task-number: QTBUG-30142 Task-number: QTBUG-31071 Change-Id: I13a8ffb9fb9d8c71d35de75094275388fa427f2c Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * Cocoa: Use actual modifiers when sending ShortcutOverride eventGabriel de Dietrich2013-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Probably a typo since keyCode clearly has no modifiers encoded. Change-Id: I1c7908b06a759baf7b2c3462861a5d61f8c52b9f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * Android: Compile jar file on WindowsEskil Abrahamsen Blomfeldt2013-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the way the DEX_CMD is formatted on Windows this would break every time. Since we actually bundle dx.bat in the repository, there's no need to check for its existence, so the easy fix is just to move the existence check into the code path where it's run from the SDK. Task-number: QTBUG-31405 Change-Id: If1aeb744d3abbd2488153b13aac401436965074e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
* | | Silence warning in QtNetwork buildThiago Macieira2013-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qnetworkconfigmanager.cpp:63:9: error: unused variable ‘shutdown’ [-Werror=unused-variable] This warning was introduced by f273d6fbc02055ff3999adc0df76360ca0670435 Change-Id: Ied650a4d94d18495684a8f08ab5f2cd628026fb7 Reviewed-by: Jonas Gastal <gastal@intel.com> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | | Fix leak in QNSView.Ivan Komissarov2013-05-311-0/+2
| | | | | | | | | | | | | | | Change-Id: Ide0e826bf068340c86d87a8ccbb3bd58b60f6d8c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | Support Mac key equivalent Cmd+PeriodGatis Paeglis2013-05-312-0/+18
|/ / | | | | | | | | | | | | | | | | | | On Mac Cmd+Period isa special key combination which never got delived to Qt application. We can intercept these special keyboard shortcuts in the performKeyEquivalent function. Task-number: QTBUG-11386 Change-Id: I680385bde07b2810e8bde86ec9fbbe7e09156c84 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Support setting the library-search environment on a few more OSsThiago Macieira2013-05-311-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most Unix systems will honor LD_LIBRARY_PATH (all ELF-based systems definitely do), so let's not make it an error if the user isn't compiling on Linux or FreeBSD. The only known exception are Darwin / Mac OS X and AIX. For everything else, cause an error. The list of unames came from: http://en.wikipedia.org/wiki/Uname. AIX does not use ELF, so its variable is called LIBPATH: http://publib.boulder.ibm.com/infocenter/forms/v3r5m0/index.jsp?topic=/com.ibm.form.api.configuring.doc/api_configuring_unix_path.html Change-Id: I67055e6a231aa1430d91431e7cab5f98f0e1bd95 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix the host_bins variable in the QtCore pkg-config fileThiago Macieira2013-05-311-1/+1
| | | | | | | | | | | | | | | | The qmake HOST_BINS property has no /raw variant. We need to use the regular one. Change-Id: I38254f77d1039c312913a987353342ce5ed3feec Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Refer to setDragEnabled in QLineEdit's detailed description.Mitch Curtis2013-05-301-1/+2
| | | | | | | | | | | | | | | | | | It's currently not obvious how to drag text from a QLineEdit. Task-number: QTBUG-22413 Change-Id: I5b92ce5c7425a1cb8ee6f401c685424eb9396592 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix incorrect statement in QTreeWidgetItem docs.Mitch Curtis2013-05-301-2/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-25598 Change-Id: Ib90578081d4e52877ce4842ebbc824ef74179341 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | remove pointless QString::arg callJoerg Bornemann2013-05-301-1/+1
| | | | | | | | | | Change-Id: I6838e73c68a2d16ecb053f897e81b06d7186a166 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | fix license headersJoerg Bornemann2013-05-302-2/+2
| | | | | | | | | | Change-Id: I10738f89cc0f8629adb787b2477d4170ff4d44e3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Bump Qt version to 5.1.1Sergio Ahumada2013-05-291-2/+2
|/ | | | | Change-Id: Id5e2e1c69f09e43460e45d8ccf7a430f3052149b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* iOS: bugfix function portraitToPrimary()Richard Moe Gustavsen2013-05-281-1/+1
| | | | | | | | | | The old implementation was wrong since it did not use the screen's height (which was already in primary orientation) to calculate what the new y value of the target rect (which was in portrait) should be. Change-Id: Ie5b2241119e244d099e06d85f69953c1d64979aa Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Fix transparent toplevels on Mac OS X again..Gunnar Sletta2013-05-283-7/+18
| | | | | | | | | | | | | | | | | We're using QWindow::format() to decide opacity or not in a few places, but this used to resolve to QPlatformFormat::format() which would in turn return a default format without alpha set. Instead, return the format requested by the user. Masked windows were always broken as converting a 32-bit image to an Indexed8, doesn't give a grayscale image, but rather a randomly spreadout set of indices based on the colortable generated by the converToFormat function. Task-number: QTBUG-28531 Change-Id: I537288f85c70b1e6194785b9ebcb5ea1f9581cee Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* iOS: Use right DPI for all iPad Minis, not just the WiFi versionTor Arne Vestbø2013-05-271-1/+1
| | | | | | | | The 3G versions are iPad2,6 and iPad2,7. Change-Id: I43a00e84535d494550bca8a533a6d16af4be6722 Reviewed-by: Ian Dean <ian@mediator-software.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Avoid double-highdpi scaling for attached painters.Gunnar Sletta2013-05-271-0/+1
| | | | | | | | updateMatrix will us both redirection matrix and highdpi scale matrix, so make sure we don't multiply it in twice. Change-Id: I7394e504746a8de54b4dc79492264deba320538f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* iOS: take orientation into account when reporting touch positionsRichard Moe Gustavsen2013-05-271-3/+6
| | | | | | | | | | This implementation will look at the orientation of the main screen to convert the touch coordinates. This will most likely change in future work, where we might look at a views view controller instead to decide orientation etc. Change-Id: Ic7875c5ecc4f21538f82a4f0467350bdf8ecc0b0 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 23:08:53 +0000