summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Replace all ocurrences of NSApp with [NSApplication sharedApplication].Jake Petroules2014-09-0116-88/+89
| | | | | | | | | | The former returns an id and the latter returns an NSApplication*. This gives us the benefits of static typing and resolves a build error on OS X 10.10. Task-number: QTBUG-39644 Change-Id: I62939b168f391beb846f8a1c5ae789e45bceb858 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix QPainter::drawPolyline() painting errors with cosmetic penaavit2014-08-291-4/+4
| | | | | | | | Task-number: QTBUG-31579 Change-Id: I8fd2c03ff9a22e4963bfcbcfe196ae4c61b9e10f Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> (cherry picked from qtbase/319cbb7597100f3b65792dc6a0ce2885ce6c0e8c) Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* QMacStyle: Fix focus frame rendering in YosemiteJari Tenhunen2014-08-201-5/+14
| | | | | | | | | | | | | | Using the HITheme API would result in the frame's right edge to be missing. Instead, we use the recommended technique to draw the focus ring around a custom NSCell. (See https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/ControlCell/Articles/ManipulateCellControl.html) Backport of 769af6689337285927a2637b184149f688332542 from Qt5/qtbase Change-Id: I8f3992edc065e14632ec4e473732b30bcf4c1937 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mac Style: Fix QLineEdit frame in 10.10Jari Tenhunen2014-08-191-10/+8
| | | | | | | | | Also removes some dead code. Backport of 83f06da1c6bffff61af78cbe75a0691d53742b53 from qt5/qtbase Change-Id: I7e088ca8b52bc3e2da25e29ab570469eab6f97bf Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* refactor disconnectFromFtp to remove cached entries when necessaryMatt Broadstone2014-08-182-12/+15
| | | | | | | | | | | | | | | | | In cases where a cached ftp connection fails to connect, or a file transfer has failed, we should removed the cached connection. Since qnam has an idea of a single internal QFtp per full operation, when file transfers failed previously the cached connection would be reused for subsequent connections and thus fail. [ChangeLog][QtNetwork][QNetworkAccessManager] QNetworkAccessManager now properly handles FTP transfer failures by removing failed cached ftp connections. Task-number: QTBUG-40797 (cherry picked and adapted from qtbase/45cbbe56bc13216b83215ea148590eccf81f420a) Change-Id: Ie9eec5ec54af16a8d19e34d04bdd993cc7bbd0f5 Reviewed-by: Richard J. Moore <rich@kde.org>
* Remove use of 'register' from Qt.Kevin Funk2014-08-1128-213/+213
| | | | | | | | | | | | | | | It is deprecated and clang is warning about it [-Wdeprecated-register]. Original patch from Stephen Kelly, see commit d9fb6e6dbb2b322556d581265da2442e3b91a6a3 in qt5/qtbase This is a backport of this commit + additional manual replacements in header files. There are still some 'register' uses inside implementation files left, but headers are all 'register'-free now. Change-Id: I7225381df1f093073583d62fa86f7bd7cca869c7 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix Flickable mouse grab issue.Robert Griebl2014-08-061-0/+1
| | | | | | | | | | | | | This issue cannot be reproduced on the desktop with a mouse (at least I could not). It can however reliably be reproduced on iMX6 embedded hardware with a touch-screen. It seems like the TS driver is reporting mouse events with a much more coarse granularity than the USB mouse driver, which in turn triggers this bug. (Qt5's quick1 and 2 both have the same issue) Change-Id: Id151e3847bc8d77c7b405b9c4d4d5747a6e33ed0 Task-number: QTBUG-27185 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Add handling of value-type lists to QDeclarativeExpression::evaluate()Robert Griebl2014-08-051-1/+13
| | | | | | | | | | | QDeclarativeExpression::evaluate() converts all arrays to QList<QObject *>, even if the items cannot be represented by a QObject *. In case of a string-list, a QList of null-pointers is returned (which isn't very helpful). This patch makes evaluate() convert arrays, which contain ONLY value-type items, into a plain QVariantList. Change-Id: I4e5052af9fb296a4b692df7840bdd188298f7416 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix at lot of QT_NO_ define guards for very tiny Qt builds.Robert Griebl2014-08-0517-0/+96
| | | | | Change-Id: If33639be245a1ad3782e1fde279371f330a988be Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix compilation warnings due to superfluous commas at the end of enums.Robert Griebl2014-08-052-4/+4
| | | | | Change-Id: Ibc05eec8a109d68cfa2caa64ea069d77c456c41e Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Don't convert signed to unsigned when we need all 32bitAllan Sandfeld Jensen2014-07-301-2/+2
| | | | | | | | | | | | | | The fast scale methods qt_scale_image_16bit and qt_scale_image_32bit were incorrectly assigning an unsigned value to a signed variable, which broke their support of images with dimensions from 32384 to 65535. Images with dimensions higher than that are already using another code- path. Backported from change 0afc80c9225ca9630f627fe1aea3d4fd7f958082 in qtbase Task-number: QTBUG-40297 Change-Id: Ib55f7f9294f03a2f81206130e665af452f8cd085 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* qwidget_win.cpp: Initialize WINDOWPLACEMENT correctly.Friedemann Kleint2014-07-281-0/+1
| | | | | | Task-number: QTBUG-40466 Change-Id: I93ff7977d68d36bc89f98d6a43c103a2a8d730f7 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Fix compilation of QWinInputContext with Q_IME_DEBUG defined.Friedemann Kleint2014-07-281-13/+13
| | | | | | Change-Id: I4f96b8ff57957e3cc370e5b1f37a036a619ce3f9 Task-number: QTBUG-40402 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Move the C++11 support macros to a central place.Raphael Kubo da Costa2014-07-231-39/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main objective of this commit is to make C++11 support work with clang: so far, the Q_COMPILER_* definitions related to C++11 were enabled based on __GNUC__ and __GNUC_MINOR__; while clang does define those two, __GNUC_MINOR__ is hardcoded at "2" and thus none of the macros end up being defined. We now make qglobal.h more similar to how qtbase's qcompilerdetection.h works by separating the detection of the C++11 features supported by a compiler from the detection of the compilers themselves. It is important to note the list of macros has not changed, the macros have only been moved. This commit either follows the spirit of or is a cherry-pick of the following qtbase ones: - 4131c323a36ee8680a3b4d66a2a03a00544751c2 (Update the C++11 support macros) - 8dd66f42e834320c4ba0a6f2e45855d591b3b6e7 (Avoid undefined macro warning for __GXX_EXPERIMENTAL_CXX0X__) - fe5d5fdaf1d9b7d108727d290e24a6b0f00139c6 (clang: Use __has_feature() to detect C++11 features) - 0ec953c93688ec0de74cda43b91f66f4cf879e5f (Remove extra Q_COMPILER_xxx defines from the MSVC section) - 163dcf2b71f34a12137f200e4af5640e42e5f5e2 (Fix build with older Clang versions without __has_extension) - 53262b9b5b9cb536916f6d6e086a944cb17bb8d8 (Only define the MSVC C++11 feature macros in C++) Change-Id: I2ca35af1a23260a9373943f97a8a72db3fc670e4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QSslCertificate: blacklist NIC certificates from IndiaPeter Hartmann2014-07-101-0/+4
| | | | | | | | | | | | Those intermediate certificates were used to issue "unauthorized" certificates according to http://googleonlinesecurity.blogspot.de/2014/07/maintaining-digital-certificate-security.html , and are by default trusted on Windows, so to be safe we blacklist them here. (backport of commit 916c9d469bd0df227dc3be97fcca27e3cf58144f) Change-Id: I22c6637895dcd21b1f7af73fdd5ca39d4747cf9e Reviewed-by: Richard J. Moore <rich@kde.org>
* Mac: Fix mixing unified and non-unified toolbarsDavid Garcia2014-06-181-1/+1
| | | | | | | | | | | | Test if the target toolbar is actually a unified toolbar before calling the special MapFromParent function. This change is not needed in Qt 5. Task-number: QTBUG-36100 Change-Id: I37fce89c79f5fce057e0b31d4c4f2e72269cdb06 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* network internals: do not try to cache a deleted entryPeter Hartmann2014-06-182-0/+12
| | | | | | | | | | | We were keeping a dangling pointer to a non-existent QIODevice around which would lead to a crash. This is not reproducible in Qt5 anymore. Task-number: QTBUG-17400 Change-Id: I19af701a42e48c05d04dec18eca9f1bfc7e1f4bb Reviewed-by: Richard J. Moore <rich@kde.org>
* fix compilation errors with OS X 10.7 SDK or later for the Carbon flavorAshish Kulkarni2014-06-161-0/+56
| | | | | | | | Some deprecated functions have been removed from the the 10.7 SDK, but the symbols are still exported by the 32-bit libraries. Change-Id: I5e7843db02f9fdb6288425ce32574b43087958ce Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Use correct values for MAC_OS_X_VERSION_10_* defines.Jake Petroules2014-06-131-12/+47
| | | | | Change-Id: I1951fd6447a3d9d20feea99408174d4993a81f5c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Properly escape bytearray data outside the ascii range when using a codecLars Knoll2014-06-121-2/+5
| | | | | | | | | | | 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>
* 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 visual index lookup in QTreeViewPrivate::adjustViewOptionsForIndex().Friedemann Kleint2014-05-071-9/+2
| | | | | | | | | | 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>
* 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>
* 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-223-11/+12
| | | | | | | | | | | | | | 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>
generated by cgit v0.12 at 2025-02-16 21:15:22 (GMT)