summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Properly escape bytearray data outside the ascii range when using a codecLars Knoll2014-06-122-2/+28
| | | | | | | | | | | Some codecs can't handle the range outside ascii properly and would then fail to read the data back in correctly. Backport of change 7df8b1ada4b23acedda5724b492c26a8e322648b from Qt 5. Task-number: QTBUG-15543 Change-Id: I4c02921e787a939eeec0c7a11603b5896d756aef Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Windows: Added Comma to list of possible numpad keysOliver Wolff2014-06-121-0/+1
| | | | | | | | | | | Some keyboard layouts (German and Czech for example) have comma instead of period on the numpad, so this key should also be considered when setting the Qt::KeypadModifer state. Task-number: QTBUG-38248 Change-Id: I06847a02a9334c21784790eae6fd7e1bc6de4099 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from commit 7e44e4bb4e23758be7c05261e0413365491c6846)
* Cleanlooks style: Fix floating point exceptionAlexandre Rostovtsev2014-06-071-1/+1
| | | | | | | | | | | | | | | | In QCleanlooksStyle::drawControl, if indeterminate == true and rect.width() == 4, we will end up with slideWidth of zero, and take a mod by zero when calculating the value of step. This causes a crash in Quassel 0.10; see https://bugs.gentoo.org/show_bug.cgi?id=507124 Instead, calculate slideWidth based on max(width, minWidth) where minWidth was already set as 4, ensuring that slideWidth >= 2. Change-Id: I6678789105e359fa26c99409f449cad0ba3bd0ae (cherry picked from qtstyleplugins/8ff2ac6035fb1d01f5c0054ba14afb949410e3a7) Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Update for OS X Yosemite.Jake Petroules2014-06-062-1/+8
| | | | | | | | (Qt 4 equivalent of qtbase/203ce7c5ce36f300750607b74b2d2429be2d4959) Change-Id: Icce8517d02dc70b545cf68a265e28083018b3225 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix trailing whitespace.Jake Petroules2014-06-061-1/+1
| | | | | Change-Id: Iab22897d7c766202d214b04d422e56becb544e40 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QClipboard Windows debugging: fix compilation with VS2005.Samuel Gaist2014-06-021-3/+3
| | | | | | | | | | This patch based on Qt Creator allows Qt 4 to be built using VS2005 [ChangeLog][Windows] Fixes build with MSVC 2005 Task-number: QTBUG-39133 Change-Id: I413beb063b5d1f458cfa26f54f6bbd2de9240380 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Doc: be more explicit about need to set expected SSL cert in errorsArnaud Bienner2014-06-022-2/+4
| | | | | | | | | Note added in QNetworkReply and QSslSocket documentation. Task-number: QTBUG-16770 Change-Id: I2dd8cfb913ec29a96b5465a905cd213713b8d537 Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from qtbase/34590e84d4aaceb5874d8acb6a2b7a95c153cd6a)
* Fix QSysInfo::macVersion for OS X minor versions greater than 9.Jake Petroules2014-05-311-2/+3
| | | | | | | | | | gestaltSystemVersion's encoding only has room for a single version digit. Thus, OS X 10.10 would previously have been detected as OS X 10.9 (Apple's comments in the header even warn against this). (backported from qtbase/42f9a61608fe662e797dc6541f4e82c19b878d56) Change-Id: I329355135e82d0e57d9b70a93a62a5f086aa0955 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix raster graphics on X11 RGB30Allan Sandfeld Jensen2014-05-261-1/+1
| | | | | | | | | | | The window surface incorrectly assumes that any pixel depth of 24 or above would be on 8bit/color. This breaks 10bit/color formats like RGB30. This patch instead make it specifically check for color depth 24 or 32 which are the two with 8bit/color. Task-number: QTBUG-25998 Change-Id: Id0b7e07bdb64679f8c647158938da12efede9142 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* fix WINVER #ifdef for QS_TOUCH and QS_POINTERJoerg Bornemann2014-05-201-2/+2
| | | | | | | | | The condition in WinUser.h is _WIN32_WINNT >= 0x0602. This change is a backport of qtbase/e26ed09102e2eb350eb072decbd670b7d515be45 Change-Id: I0725e65948528889623a0b0ff290745996a8b0a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Tslib plugin: also apply missing release coordinate code to non-raw modeRolf Eike Beer2014-05-151-7/+6
| | | | | | | | | Even if the normal mode is used the release events may have zero coordinates. Change-Id: I2eac8cf50dfcf9e62d8cec2423419a6579266849 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qtbase/9ba7cc07dbef542bc73f97f1d7458699d25fbb8d)
* Tslib QWS: also apply missing release coordinate code to non-raw modeRolf Eike Beer2014-05-151-2/+2
| | | | | | | Even if the normal mode is used the release events may have zero coordinates. Change-Id: Ia9de05928ab5dfc225665e3b2c9a4d42f6ba984e Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Memory and file descriptor leak in QFontCacheSimon Yuan2014-05-146-84/+55
| | | | | | | | | | | | Make the cache also use the ref counts Make everyone who decrements a ref count check for 0 and delete Move all cache logic to the cache Same idea as 36cb3f3 and b3dae68 in Qt 5 without the extra stuff Task-number: QTBUG-38035 Change-Id: I27bea376f4ec0888463b4ec3ed1a6bef00d041f8 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Restore dirty line logic in RenderInline::destroyAshish Kulkarni2014-05-091-1/+2
| | | | | | | | | | In ea0cb7ad2066d9c3dc695ab2ebe724249b05ca0f the webkit version was upgraded which effectively merged http://trac.webkit.org/changeset/85869 The follow up patch was never merged: http://trac.webkit.org/changeset/86060 associated with ​https://bugs.webkit.org/show_bug.cgi?id=60448 Change-Id: I7dff1733439bb3bcfecc767da9147aa09a3159cf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix detection of newer MinGW toolchains in configure.exeKai Koehne2014-05-091-2/+2
| | | | | | | | | | | | | | | | | | | This fixes a regression in the new MinGW packages that are now built with mkspec win32-g++-4.6: Since we failed to detect this as a MinGW mkspec we missed to check for headers in all relevant paths, which disabled windowsxp, windosvista styles by default. This commit does not apply to Qt 5, similar issues there are being fixed independently. [ChangeLog][Windows] configure.exe now detects newer MinGW versions correctly, enabling windowsxp and windowsvista styles by default. Task-number: QTBUG-38706 Change-Id: Ib4e7af69e8040aaa28940f501cce5572588d4378 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Windows: Add missing colors to tooltip palette.Friedemann Kleint2014-05-091-0/+4
| | | | | | | Task-number: QTBUG-38183 Change-Id: Ic3581cc87c0d61140624ddaf6fa85d682120ad4f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> (cherry picked from qtbase/9fc0c5466238eb8f43d2736d298ac36c65da529e)
* Fix tst_QStyleSheetStyle::toolTip().Friedemann Kleint2014-05-091-1/+19
| | | | | | | | | | Use the correct palette and enforce plain Windows style to prevent the Vista style from clobbering the tooltip palette in polish(). Task-number: QTBUG-38183 Change-Id: Id19d548f818d801c4914a343e08207195c343888 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> (cherry picked from qtbase/7a2547164d207119468abbfa4c0eb594948bb608)
* Fix visual index lookup in QTreeViewPrivate::adjustViewOptionsForIndex().Friedemann Kleint2014-05-072-9/+29
| | | | | | | | | | Determine the visual index by looking up the column of the QModelIndex in the logicalIndices array instead of looping. Task-number: QTBUG-37813 Change-Id: I5c3c73c67537877b03cdc2c36a52041d99f7f49d Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from qtbase/85aef2dd4b059d2ba9cba4605d9fef87f3e2c4fc)
* Fix MacOS build with SDK 10.7, XCode 4.3 and aboveWolfgang Bremer2014-05-071-2/+4
| | | | | | | | | | | | A hardcoded path condition failed and thus the dependency CoreWLAN was not added. This caused missing symbols. This patch is not necessary for Qt5 as only SDKs 10.6+ are supported. Task-number: QTBUG-24361 Change-Id: I273a2be8d2bd7c72e8d7a1eed7c3e62a380e237a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Don't crash on broken GIF imagesLars Knoll2014-05-061-0/+7
| | | | | | | | | | | | | | | | Broken GIF images could set invalid width and height values inside the image, leading to Qt creating a null QImage for it. In that case we need to abort decoding the image and return an error. Initial patch by Rich Moore. Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5 Task-number: QTBUG-38367 Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a Security-advisory: CVE-2014-0190 Reviewed-by: Richard J. Moore <rich@kde.org>
* QMdiArea: Ignore events of other instances in the event filter.Friedemann Kleint2014-05-061-0/+3
| | | | | | | | | | | | This caused for example the variable QMdiAreaPrivate::isSubWindowsTiled being cleared from another instance, which resulted in odd resizing behavior. Task-number: QTBUG-31448 Change-Id: I880f7e415d6654e52499df1bfaf99f2c55d86320 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtbase/9e2c4bc67f30eb1e8d776afe3a092d5994aaab38)
* Don't use QAbstractButton::pixmap() as this will always return 0.Andy Shaw2014-05-061-2/+2
| | | | | | | | | Instead of using pixmap() we use icon() instead which is what the extension menu is after in this case. Task-number: QTBUG-38301 Change-Id: I2c238b50b0fcf04318100d2d6d39f563ef3eff5b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Polish the image gestures example.Friedemann Kleint2014-05-065-29/+137
| | | | | | | | | | | | | | | | | | | - Add command line parsing to properly evaluate help option and directory argument, add options to disable gestures. - Add verbose option so that the user can actually see what is happening. - Scale large images. - Use qreal instead of float. - Minor polishing: set window title, position file dialog at pictures location. Task-number: QTBUG-37759 Task-number: QTBUG-37203 Change-Id: Ibaf54a13034b150386a8aee476f83a9eba298298 Reviewed-by: Indrajit Tapadar <indrajit.tapadar@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> (cherry picked from qtbase/c0701f3789acf3234e9f6431b4e8c7dc3ccefabb) Reviewed-by: Marko Kangas <marko.kangas@digia.com>
* Use WINVER instead of _MSC_VER for version check in qeventdispatcher_win.cpp.Joerg Bornemann2014-05-061-2/+2
| | | | | | | | Task-number: QTBUG-38604 Change-Id: Idb8a8219e09c6aa1a1b24e45b9da640c8d4b7161 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> (cherry picked from qtbase/e30ae1268f8e224369ff7841b90184c8694a86e7) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix - psql driver must format qdatetime using isoCristian Tarsoaga2014-05-051-2/+2
| | | | | | | | QDatetTime must be formatted as ISO8601 specifies, date/month must be padded with 0 until width is 2 Task-number:QTBUG-33389 Change-Id: I2db10e4b0f55a2666b2a12d7d8fcd03f13b96875 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* fix include of private headerMark Brand2014-05-031-1/+1
| | | | | Change-Id: I0554933de2536231d7d416d8df5b96eaa459fc51 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Refactor OS X bundle detection for QFileInfoSamuel Gaist2014-05-022-14/+66
| | | | | | | | | | | | | | | | | | | | | CFBundleGetPackageInfoInDirectory originally used tests for the presence of information that are not mandatory in a bundle. Following Apple's documentation, the new approach is to use Uniform Type Identifier which queries the OS directly to check whether the extension conforms to kUTTypeBundle. That includes e.g. applications, frameworks etc. Then it tries to determine if the bundle can be opened with an application that is not Finder. Last thing, it checks whether the package bit is set. (cherry picked from qtbase/72d60ea08c14037250459a5424ffee7a36b909b1) (cherry picked from qtbase/bcfc68f9cd00982decd7ceb312966caf6b1ca05e) (cherry picked from qtbase/afacf694d5a6f34b88989e76971d70d700ce4949) Task-number: QTBUG-31884 Change-Id: I4ce3d8b90d116960b2044d3fafe3f745f6141416 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Updated changes-4.8.6 fileaksalova2014-04-231-14/+270
| | | | | | | Change-Id: Ia758818a9fcb716baeaf37c0fc37cb79c7974cf5 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
* Vista Style: More menu item pixel fixes for QtQuick ControlsGabriel de Dietrich2014-04-221-2/+2
| | | | | | | | | | | | Includes a one-pixel fix for widgets, where the menu item text would be one pixel too far away from the vertical gutter. Task-number: QTBUG-37451 Task-number: QTBUG-38376 Change-Id: I2539233814a427c5bed66a5c07584717eb3df418 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> (cherry picked from qtbase/9cd2dac348f45c4b93f74f8ebe20d7528821f003)
* Fix building of JSC with libc++.Raphael Kubo da Costa2014-04-221-6/+0
| | | | | | | | | | Follow-up to 0de22e8 and 427d50d: the former was not just a cleanup commit, and part of the changes reverted in the latter actually broke the build with libc++ again: clang defines __GNUC__ for compatibility with GCC, but if libc++ is used ext/atomicity.h does not exist. Change-Id: Id86646d38b7bc62dbe0731f8f32efb2353335210 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* QNX: Fix QDir::entryInfoList()Bernd Weimer2014-04-225-13/+14
| | | | | | | | | | | | | | If D_FLAG_FILTER is set, duplicate name entries are filtered out, so this flag has to be set along with D_FLAG_STAT in the call to dircntl. Also releaved dependencies between defines__EXT_QNX__READDIR_R, __EXT_QNX__READDIR64_R and _POSIX_THREAD_SAFE_FUNCTIONS Back-ported from qtbase: aee59f06e0017e225363d4207d3d96c2b30698e1 Change-Id: Ifa2148cc49544076fcfe8fb88e2a0dfe2404959e Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Fix compilation using MinGW 64 due to missing __cpuidAllen Winter2014-04-181-7/+7
| | | | | | | | | | | | Compile fails on Windows 64 using MinGW with the error message: '__cpuid' was not declared in this scope. fix by moving the Q_CC_GNU block above the WIN64 block as suggested by Thiago in the QTBUG-34022 comments. Task-number: QTBUG-34022 Change-Id: Iced4ac0b64f8ba986e49543ff3793ae8c0c33d14 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QDbus: Fix (!a == b) comparisonDavid Faure2014-04-181-1/+1
| | | | | | | | | ! binds to a, and that is wrong here. (cherry picked from qtbase/4b7cd57719a637189696d673b014ae785df669bf) Change-Id: I75542a0c27f39fb6e684dedd9925a1f3748d4919 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compilation of QtWebKit with MSVC 2013Ashish Kulkarni2014-04-171-2/+2
| | | | | | | | | | Starting with MSVC 2013, more functions are provided. Task-number: QTBUG-34705 Change-Id: I85e35a2486e0bd556f5f16e5911cca5c364273ed (adapted from commit qtscript/24d678ce9c3996f46d1069c2b1193e7ec1083fc8) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix compilation of QtWebKit with MSVC 2012/2013Ashish Kulkarni2014-04-171-0/+16
| | | | | | | | | | For some reason, MSVC 2012/2013 is no longer able to infer the need for both a call to a constructor and a cast of its parameter so we have to give a hint for at least one of these two operations. Task-number: QTBUG-31882 Change-Id: I42b54313ec4f6a83cde28326534c59b93ab3f615 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* OS X: Make Qt application react on applicationShouldHandleReopenSamuel Gaist2014-04-171-0/+13
| | | | | | | | | | | | | | | Currently a click on e.g. the dock icon is not propagated to the application so if for example the main widget is hidden, it doesn't come back. This patch fixes it Task-number: QTBUG-10899 [ChangeLog][QtGui][OS X] Fixes a bug where clicking on the dock icon would not be propagated to the application Change-Id: Ia02ca23ed0dafbd337d1d7d9bc5f7efe3843b512 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* increase timeouts to make tst_macgui autotest more stableAshish Kulkarni2014-04-171-3/+3
| | | | | | | Task-number: QTBUG-20984 Task-number: QTBUG-26372 Change-Id: I03e31e0e8c6428767cca91a8be6778ed08a2d783 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Improve handling of temporary directories in SQL tests.Friedemann Kleint2014-04-164-3/+29
| | | | | | | | | | | | | | | | | | Initialize directory delayed in shared code and add checks to verify that it is valid. Close attached / cloned databases to prevent locks on files and leaking temporary directories caused by SQLite: QTemporaryDir: Unable to remove "...\Temp\tst_qsqldatabase-P1XkOA" most likely due to the presence of read-only files. QTemporaryDir: Unable to remove "...\Temp\tst_qsqltablemodel-P1XkOA" most likely due to the presence of read-only files. QWARN : tst_QSql::concurrentAccess() QTemporaryDir: Unable to remove "...\Temp\tst_qsql-l0VAKJ" most likely due to the presence of read-only files. In Qt 4, emulate the temporary directory by maintaining a list of files and deleting them in reverse order. Change-Id: If85bbaed04bb1a32e427d642be332996d967f796 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/9a4beb4d36dc0c613e59aa5d88060d521462f56c)
* Fix crash when deleting top level windows embedded into QGraphicsProxyWidget.Friedemann Kleint2014-04-151-0/+4
| | | | | | | | | | | Clear proxyWidget pointer in slot QGraphicsProxyWidgetPrivate::_q_removeWidgetSlot(). Task-number: QTBUG-29684 Task-number: QTBUG-33213 Change-Id: Ibdbd52aa810ca908e3d98daa00954345e7a93a48 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> (cherry picked from qtbase/ff2dbe609ef4482d66d1ecd135b4f53f6aff7e60)
* Fix crash when trying to place toolbar into zero-height window.Friedemann Kleint2014-04-103-20/+32
| | | | | | | | | | Change QToolBarAreaLayout::item() to return a pointer and check return values in plug(). Task-number: QTBUG-37183 Change-Id: I7029eb9739cbe603460e87d3e5493f116bdb3a89 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> (cherry picked from qtbase/e38ad9455099a83e2a8619f19ca949bc64ae6f82)
* vcxproj generator: append version suffix only to library targetsJoerg Bornemann2014-04-081-1/+3
| | | | | | | Task-number: QTBUG-38066 Change-Id: I2f1635f2cb34acb388c380fc2fc3fbe4df04bb03 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit qtbase/826ab028a8c24b115286d251938396ca1de71b56)
* Fix access of tmpStorage in QODBCResult::exec().Friedemann Kleint2014-04-071-27/+22
| | | | | | | | | | | | | Instead of using a list and appending / popping of elements, use a vector of constant size and access via index to avoid bookkeeping errors. Task-number: QTBUG-37831 Change-Id: Icb5a182626c63e693b04daaf7a2f70997d9aeae1 Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qtbase/d5ff16bc8ebf0f17fae3a28f08018db26567e81c) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Avoid out of bounds memory reads when scaling imagesv4.8.6Lars Knoll2014-04-036-27/+45
| | | | | | | | | | | | | | | | | | The calculation of the width/height required for the scaling algorithm was prone to floating point rounding issues, where the lower value got rounded down, the higher one rounded up. This could lead to a situation where we iterated over one more line/pixel in the line than we have in the source image. Correct this by passing the dimension of the source image into the function and bounds checking the values before iterating. Backport of If44b2235a479224660d508a0504fec40d724763a from Qt 5 Task-number: QTBUG-35927 Change-Id: If145ee715a143b889538243f45227d8d78a0050f Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Doc: Mention that MINGWM10.DLL only applies to MinGW 4.4Kai Koehne2014-04-011-1/+1
| | | | | | | Mingw-builds based 4.8.2 has different files ... Change-Id: I99659c4f6e46673c6077a890b744e355c5226d36 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix link to Tier 2 mingw-builds versionKai Koehne2014-04-011-1/+1
| | | | | | | | | We switched to rev3 in the binary packages to get in a gdb fix. This change does not apply to Qt 5. Change-Id: I0328c35671e84e3b592c99cf5ebe8d1cce1ea80f Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
* Assistant: Set the url on created QNetworkReply objects.Stephen Kelly2014-03-311-0/+1
| | | | | | | | | | | | | | | | | | | WebKit needs this as a base url in order to resolve links in css for example. If index.html is at the location doc/, and it loads a css stylesheet at href="_static/first.css", and first.css contains @import url("second.css") Then second.css should be found in _static, relative to first.css. That only works if WebKit knows the requested url of the loading document, so make sure that is set on the reply object. This is a backport of part of commit qttools/e38ee135f3cf74f413dc7a3e4a9f97a6b5d903bf Task-number: QTCREATORBUG-8211 Change-Id: Ia92519ab37269a6d3f8bf0e4f8b348595f1f3d59 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Pass events to QGestureManager from the main (GUI) thread only.Friedemann Kleint2014-03-281-9/+12
| | | | | | | | Task-number: QTBUG-20946 Change-Id: I964452c1e97bd3d3a521e33abeb2f7d8cdbc89a9 Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtbase/9b28ab3f38e21f2e1498dea5dd761d22d72fb1ac)
* printsupport: set duplex setting correctly to CUPS printerTeemu Katajisto2014-03-281-14/+14
| | | | | | | | | | If CUPS printer default is not DuplexNone then setting duplex to None for printer did not have any effect on duplex setting. (backported from qtbase/385e584926f2957d6e9ec4c2c4e89b37a5e0c80c) Change-Id: Ia72f599a9e5fa511b3214c6b8016e21f40409b86 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* QPrintDialog OSX: don't crash if ApplicationModal and no parentShawn Rutledge2014-03-281-1/+3
| | | | | | | | | | Task-number: QTBUG-32464 (backported from qtbase/03855decfcb4e05817424843564a4b66636bb347) Change-Id: I12892798419b2efcf404f972930562d50d045ea3 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* QPrintDialog: document the modality on OS X and WindowsShawn Rutledge2014-03-281-0/+4
| | | | | | | | | | | | You can't programmatically close the dialog because it's modal. Task-number: QTBUG-32464 (backported from qtbase/bd602a2dc4bc9491f80919b09a8990edb6fbee97) Change-Id: Ib7573b347b3f10914e60af05f95ed9f5763eadd8 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
View Lorry Controller Status