summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Updated year in copyright headerKai Koehne2014-03-2611779-11857/+11857
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add AArch64 support to qfilesystemwatcher_inotify.cppLisandro Damián Nicanor Pérez Meyer2014-03-241-0/+9
| | | | | | | | | | | | Based on a patch by Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>, licensed under CC0 (aka Public Domain) or BSD license. Backported from qtbase, commit d5dcd6d16647e4ecac239fa26ade5963f0e3f933 Change-Id: I0d01a129c039250ac33dc5f984baec9595786211 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QPushButton: draw label using the stylesheet's font.Mitch Curtis2014-03-211-0/+8
| | | | | | | | | | | | The RenderRule for the stylesheet has the correct font information, it just wasn't being set on the painter that draws the label. This is a backport of the Qt 5 commit: 9ad768fd1999780df18551151b9d9fa9c354131c. Task-number: QTBUG-8990 Change-Id: I4857d6e17b62980782ca7bfdfd0a571a9950f635 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* rebuild configure.exeOswald Buddenhagen2014-03-211-0/+0
| | | | | | | | | 95f256d: Remove incorrect check for mingw 64 bit 51f77e9: Fix detection of mingw gcc >=4.6 Change-Id: I8e5a7ac1e8c76f346f58e44cf5b9eb781a1ac4c7 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QMenu: Sloppy menu selection should allow hovering separatorsGabriel de Dietrich2014-03-201-0/+1
| | | | | | | | | | | | | | | Setting the current action to 0 clears the sloppy region and closes the submenu if we hover a separator on the way to the submenu popup. Now, we choose not to while the sloppy delay timer is running. This is a backport of I9d1b1358fe64c259dc47f35db8fc8f2b19a73153 from qt/qtbase. Task-number: QTBUG-20094 Change-Id: If4b3cff05a9bcb41cee3e49490d4cc5fc3595821 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QMenu: Enable sloppy submenu mouse navigationGabriel de Dietrich2014-03-204-7/+16
| | | | | | | | | | | | | | | Since we're in the 21st century, we set QCommonStyle to return true to the SH_Menu_SloppySubMenus style hint. This unlocks all the logic already available in QMenu. This is a backport of I134c87e348d98d1f46055e0bfef2b4a4a3d2993a from qt/qtbase and includes some previous enhancements. Task-number: QTBUG-20094 [ChangeLog][QtWidgets][QMenu] Enable sloppy submenu mouse navigation Change-Id: If4141a3d849123850e40af92ac5aede9ed767bdf Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QMenuPrivate: Make sloppyDelayTimer non-staticGabriel de Dietrich2014-03-202-7/+6
| | | | | | | | | | | | | | | Keeping the timer static would trigger warnings when enabling SH_Menu_SloppySubMenus in QCommonStyle in a forthcoming patch. This would happen if we opened a second level submenu quickly enough and get the mouse event handler to reset the timer its parent menu started. This is a backport of Ia768603b40b219f87138c60a595c65ef408761ae from qt/qtbase. Change-Id: Ia7e9a94b3445d9362a60a36d5e4dda878ab0f7a5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Store changed status of the QAxWidget's "control" property correctly.Friedemann Kleint2014-03-191-4/+9
| | | | | | | | | | Handle the case of it being PropertySheetStringValue. Task-number: QTBUG-37602 Change-Id: Iff54d6409ffabf48406fcfec96289848a42b3e55 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/9ee8213c7becfdf906ca781df4895e18b273e023)
* Fix QByteArray memory corruption in QIBaseDriver::open().Friedemann Kleint2014-03-191-20/+15
| | | | | | | | | | | Rewrite code to use QByteArray::reserve(), QByteArray::append() instead of memcpy(). Task-number: QTBUG-37508 Change-Id: I16ead153f33fa5a34bc01ee27ae4cd1b8993b65e Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qtbase/0d50efeae9829336ffb7e47692cfdc649e10ee70)
* BlackBerry: Improve platform specific documentationBernd Weimer2014-03-182-2/+20
| | | | | | | | | | Updated BlackBerry specific documentation around QSettings to make the differences more obvious for developers. Back-ported from qtbase: 563342d7ef7e490239cba6d335849ebb91983b9a Change-Id: I603053cecff97f3222257cbba8d72d2ec2666d6f Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Use QCOMPARE instead of QVERIFY where applicableFrederik Gladhorn2014-03-171-21/+20
| | | | | Change-Id: I39dc7eac6d9478797adf55a69b829578f4adc5eb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Basic AArch64 (aka arm64) detection.Lisandro Damián Nicanor Pérez Meyer2014-03-171-0/+6
| | | | | | | | | | | Patch by Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> licensed under either Public Domain or BSD: <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#179> Change-Id: I9f415cb6ac6c4ff78588d96e36198c85ee202d96 Reviewed-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QWindowsXP/VistaStyle: Fix detection of item view delegate line edits.Friedemann Kleint2014-03-173-15/+17
| | | | | | | | | | | | | | The old code tried to check the 2nd parent for inheritance from QAbstractItemView. This also triggers for line edits on a QDialog parented on the item view. Introduce convenience function that checks for top levels in the chain. Task-number: QTBUG-37504 Change-Id: I932f8efdb4764e9b1eea84c802bf7e8718338e1d Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> (cherry picked from qtbase/176342e70a1ba7864a5b5dac14d12d4091ef5bd9)
* network: fix doc typo in QNetworkConfigurationManagerPeter Hartmann2014-03-131-1/+1
| | | | | | | (cherry picked from commit 32794abe722161e1224920865c77c37d74ab977b) Change-Id: Icc66ac3fef52508abda85bafe225fc93f4eb9d4c Reviewed-by: Richard J. Moore <rich@kde.org>
* Remove -fuse-ld=gold from webkit's LFLAGSNiels Ole Salscheider2014-03-131-7/+0
| | | | | | | | | | | This flag is not supported by upstream gcc. Thus the build might fail if the gold linker is found. This fixes https://bugs.webkit.org/show_bug.cgi?id=89312. Change-Id: I931081fccf64a43b32f2aaf2c3ad377391fdad4c Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Windows: Restore maximized/full screen widgets to correct screen.Friedemann Kleint2014-03-131-4/+17
| | | | | | | | | | | | | | | | | | | | | Partially revert 54865d47cfd859a0e84ba8e1bbff3b56c93d4e0d and bring back parts from abba37cd0eff959edf2d011842cbf2b36cce8467 which failed some tests on other platforms and never made it in. Avoid setting a geometry on maximized windows since that leaves them in a broken state. Instead, if there is a need to restore maximized windows to a different screen, clear the maximized flag before applying the geometry. [ChangeLog][QWidget][Windows] QWidget::restoreGeometry() now restores maximized/full screen widgets to the correct screen. Task-number: QTBUG-21371 Task-number: QTBUG-4397 Change-Id: Ibd5b736e921f20d4b7365c06c6f9c5dd4469c781 Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtbase/ae4243df1e53b0aaeada708f6fa7979a0f0d216a)
* Fix a crash when reparenting widgets on Windows.Friedemann Kleint2014-03-131-4/+6
| | | | | | | | | | Introduced by a9edbeddafe5d8866192de44f4028d07bd93013a . Task-number: QTBUG-37346 Task-number: QTBUG-30276 Change-Id: I81e218839db50a88a8b149dd5481bfd0835284da Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix recursive calling of QScriptProgramLars Knoll2014-03-132-1/+3
| | | | | | | | | | | | | | The first time a QScriptProgram is evaluated, it gets compiled and then executed. If the execution would somehow trigger another evaluation of the script program, it would run into the compile stage again (even though it already was compiled), and then trigger and assertion in debug mode (or leak memory in release builds). Backport of 08d9ef715265d33f4cf04693b0787fd75994dc42 from Qt 5. Task-number: QTBUG-37317 Change-Id: I83e7efd5f238d021e200258826e2e4a9520c3a7d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* do not use fileno calls in forked childJoerg Bornemann2014-03-131-4/+4
| | | | | | | | | | | | | | | | | | | | | This fixes an issue that causes QProcess::start to silently fail on OS X 10.9. Apparently, fileno(stdout) locks the handle on OS X 10.9. It may happen that the parent process fflush()s stdout while the child has just been forked. The stdout lock of the parent is never released in the child and fileno(stdout) therefore locks forever. According to the fork documentation on opengroup.org one may only call async-signal-safe functions between fork and exec in the child. The fileno() function does not appear in the list of async-signal-safe functions. Also, fileno(stdout) and friends can be easily replaced by the standard constants STDOUT_FILENO etc. Done-with: Fawzi Mohamed <fawzi.mohamed@digia.com> Task-number: QTBUG-37306 Change-Id: I2b1f5f47cc48a1ad020fb0493a955d2bc27aeb47 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from qtbase/b2216bbe06b8be2bef6d8bc2ffff1337f6d23358)
* Add AArch64 detection support to JavaScriptCore.Dmitry Shachnev2014-03-131-1/+9
| | | | | | | | | Cherry-picked from qtscript commit 2e049836ee16f4aedbe7ccc3335fc5. Change-Id: I8d9fdeceb62f4de4eb9bd74ae45bb33a641ef5cc Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Update, and reduce duplication of, QThread-related infoSze Howe Koh2014-03-132-39/+15
| | | | | | | | | | | | | | | | | | | | | | Added/Changed: - Move content from the Thread Basics overview to the QThread class ref - Rephrase bits for clarity - Use more links Removed: - (threads-basics.qdoc) Warning against moveToThread(this): This usage came about when people tried to add slots to a QThread subclass. This patch adds a warning against the root cause. - (threads-basics.qdoc) The strategy for managing member variables: Sounds error-prone. Pushing results through signals is safer. - (qthread.cpp) The note about GUI classes: Irrelevant to QThread, and it's already mentioned elsewhere. This is a cherry-pick from a9d5627e6a7b82 in qtbase.git. Change-Id: I491f64f998050daf0251abb2126bc9f7a198c17d Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Discuss the concept of thread affinity in more detailSze Howe Koh2014-03-132-31/+37
| | | | | | | | | | | | | | | | | - Create a section dedicated to this concept, which is fundamental to signal/event handling - Move relevant content from the very broad "Thread Basics" page to the QObject class ref - Flesh out existing content, including distinguishing signals from events - Address the common misconception that "member" = "child"; this has been encountered several times in the Qt Project forums This is a cherry-pick from 3b45dfe6e6ff6c0626b in qtbase.git Change-Id: If3b65f3da4e1ca414c7175c4e22bcdef38f45442 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix compilation failure in configure.exeKai Koehne2014-03-131-1/+1
| | | | | | | Fix regression introduced in (incomplete) commit 95f256d21dd. Change-Id: I319f214a38134b5b97164ec61b2ae482e6542b86 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Prevent spurious SSL errors from local certificates.Richard J. Moore2014-03-131-3/+0
| | | | | | | | | | | | | | | | | | | Qt since approximately 4.4 has set the verify callback on both the SSL store and the SSL context. Only the latter is actually needed. This is normally not a problem, but openssl prior to 1.0.2 uses the verify code to find the intermediate certificates for any local certificate that has been set which can lead to verification errors for the local certificate to be emitted. Backport of 7c8131763de9e70ca56f16635716e7e00559b5d1 Task-number: QTBUG-33228 Task-number: QTBUG-7200 Task-number: QTBUG-24234 Change-Id: I65db8b658df9ff86095381c7b87d690258f03c3a Reviewed-by: Daniel Molkentin <daniel@molkentin.de> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* tests: Mark tst_qdbus* tests as insignificant on OS XSergio Ahumada2014-03-1314-7/+21
| | | | | | | | | | D-Bus libraries were recently added to OS X 10.7 making these tests to be executed for first time. Task-number: QTBUG-37469 (cherry-picked from qtbase commit 9f87c3663d49a0a4c5affe6119ce399a6d0f5e7a) Change-Id: I7886614bcaab290c3d4fef94d93ee9ad7837a3ee Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix Mac Bearer when machine has no wifiFrederik Gladhorn2014-03-132-0/+4
| | | | | | | | | | | This manifested itself for some continuous integration machine, all regular macs have wireless. In case there is no wifi, we would never emit updateCompleted(). Change-Id: I81dce65cdbb0091944c4e79fdb5f2b7f5f70de88 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* Fix building of WebKit's JSC for earlier versions of gcc on MacAndy Shaw2014-03-131-0/+14
| | | | | | | | | | Since building for Carbon typically uses older versions of gcc on older versions of Mac, then we need to revert e3c44790065894f4e7f98ab097fce22c5bcbbd0a partially in order to fix this. Since the original code was just a cleanup then this is safe to do so. Change-Id: Ic662841f53660b763af2bc71cb9b4684fe614063 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix network tests relying on troll.noFrederik Gladhorn2014-03-133-5/+5
| | | | | | | | | | | Replacing old troll.no domain with qt-project.org domain. Using troll.no doesn't work anymore. Cherry-picked from e5785d6322051ba96b1a4a97963a64c1aabbc027 in qtbase Change-Id: Ib849205e3c8d254e4b0dfc8ed1c396259122481a Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Qt 3 Support: Prevent double deletion of QObjectPrivate::threadData in ↵Friedemann Kleint2014-02-251-0/+1
| | | | | | | | | QSettings. Task-number: QTBUG-36908 Change-Id: I8f9f86f20bd8bb479c2637f6c276e4e2593ecef9 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix building of JSC for earlier versions of gcc on MacAndy Shaw2014-02-251-0/+14
| | | | | | | | | | Since building for Carbon typically uses older versions of gcc on older versions of Mac, then we need to revert 0de22e80ac645afc3793419300d6271d95809196 partially in order to fix this. Since the original code was just a cleanup then this is safe to do so. Change-Id: I5dd8fe99704ffac66ac3384b62849fa8162ca82d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Webbrowser example: Fix crash due to deprecated code.Friedemann Kleint2014-02-203-42/+7
| | | | | | | | | | | | | | | | | The example uses a Qt Designer form with widgets on a QToolBar imported from Qt 3 which is not supported in Qt 4 and later. In the code generated by uic, a QLabel is constructed passing the toolbar as parent and added to the toolbar using QToolBar::addWidget() which then causes a crash in Qt 4. Move the widgets from the form into the class to avoid this. Task-number: QTBUG-36948 Change-Id: Ia4af871ce99faf555bebc6ebde19bcae0de4d29e Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtactiveqt/2e44efa5056355ac2c069ad2bd8a8ba6562f3eb6)
* fix PlatformToolSet tag location in vcxproj filesJoerg Bornemann2014-02-191-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> (cherry picked from commit 853a0b764e08d5f910072b6f3fd3ff3f9dc5c0c4)
* Ensure correct codec is used for Sources and Forms view.Mitch Curtis2014-02-191-1/+1
| | | | | | | | | | 6626e5f41712723405c110a4f11ad650116f7523 did it on the wrong line. This problem does not exist in Qt 5. Change-Id: Ia39bc69b3f5ad58d28994ef3cae00242a8d0adbb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
* Add MinGW-builds gcc 4.8.2 as Tier 2 platformKai Koehne2014-02-181-0/+2
| | | | | | | | | | Since we now ship an installer with it it certainly qualifies as Tier 2 (if not even Tier 1...) This change does not apply to Qt 5. Change-Id: I2cb5068867e46a42fb52c7cfdb365aa99937bb04 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Mac: Fix file dialog filters when filter doesn't start with '*'Eike Ziller2014-02-131-1/+2
| | | | | | | Task-number: QTBUG-17326 Change-Id: Ie32f2807e64aa9c90b2e7d75adcd2aef67649225 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* fix crash when using GTK 2.14 function in old gtkAndrey Volkov2014-02-131-1/+3
| | | | | | | | | | | | | | | | | | | This is additional fix for bug 23569. Previous fix (SHA1 7fcf1cf674d09d9dd1d41e2913252017f1d599ca) is not enough. QGtkStyle was still crashing with old gtk (< 2.14) in drawComplexControl () function. Bug was reproducible on CentOS 5.x and Red Hat 5.x. Current patch makes the same check as in commit mentioned but in another line of code. Task-number: QTBUG-23569 Change-Id: I261b61bc93ccaada879ed02ad4d0bef62935335b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Harri Porten <porten@froglogic.com> (cherry picked from qtbase/7df3321f934e5bd618e2ad00bf801f2b7edd31df)
* QDeclarativeTypeLoader doesn't close processed QNetworkRepliesFrantisek Vacek2014-02-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | backport of Qt5 patch https://codereview.qt-project.org/#change,76825 This bug causes that Cascades QML application cannot open more than system ulimit defined number of different asset:///*.qml files. The realFile is ordinary closed in the ~QNetworkReplyFileImpl(), the QDeclarativeTypeLoader::networkReplyFinished() calls reply->deleteLater(). There are tricky situations when event-loop is not entered and too many read already files are waiting for close. This patch close() file when all the data is read. It can be done this way since the QNetworkReplyFileImplnetworkreply is a sequential device. For more info, please, read comments on QTBUG-36032 cherry-pick from: qtbase cc88e6e92c806def34bce8cdcab275934ab646bf Task-number: QTBUG-36032 Change-Id: I896cf9a89c541d743db1ccc11ab853219d844884 Reviewed-by: Richard J. Moore <rich@kde.org>
* Fix the Carbon buildAndy Shaw2014-02-111-0/+6
| | | | | | | | | The function does not exist when building for Carbon with the 10.5 SDK so since this means the function will effectively do nothing, so we just return false in this case. Change-Id: If41762a055ebeccfcfce751e164b6a6e7e1db437 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Remove incorrect check for mingw 64 bitKai Koehne2014-02-111-7/+2
| | | | | | | | | MinGW-w64 has '64' too, but isn't necessarily a 64 bit build ... But the variable wasn't used anyway, so we can as well just remove the check. Change-Id: Ifba3ce344c5dc5e692f105bc99081ae4c69c779c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix detection of mingw gcc >=4.6Kai Koehne2014-02-111-1/+1
| | | | | | | | | | | | | | Make sure that the version check works for gcc e.g. from mingw-builds, which contains spaces in the version info, e.g. g++ (i686-posix-dwarf, Built by MinGW-W64 project) 4.8.2 In Qt 5, support for MinGW-gcc versions older than 4.6 was dropped. Change-Id: Idac5fb3a8cd01200558032ea1bd997e30f0e8b8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Ensure the webftp example works with newer versions of webkit.Richard J. Moore2014-02-081-1/+1
| | | | | | | | | | | | The code currently has a bug that it will return the incorrect number for bytesAvailable() since it doesn't take account of the QIODevice buffer. This fails when peek() is called (which is used by newer webkits). See QTBUG-27469 for an example of the problem. Note this example does not exist in qt5 so this is not a backport. Change-Id: Ic61248d0f36db6a6a65d0c48a8f40346dc7c3cb6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix compile for CarbonAndy Shaw2014-02-071-1/+2
| | | | | | | | Protect the usage of qt_mac_loadMenuNib so it is only used on Cocoa as this call is not used in Carbon code. Change-Id: I93b9b513dce934680e1d5e1fb26bf2a64e25c764 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
View Lorry Controller Status