summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Better handling of invalid font tablesHEAD4.8Eskil Abrahamsen Blomfeldt2015-10-2310-85/+198
| | | | | | | | | | | | | | | Specifically when reading files with broken cmap tables, we could get some undeterministic results. We handle this more gracefully by verifying that the offsets are sane and bailing out early if not. This replaces the current pattern throughout the font engine for consistency. This is a back-port of 4a1e5dbade4bab55f39bd368480dcca9a11e4b38 from Qt 5. Change-Id: If4172b9ef0808801c8e27ffaad962535afe572ed Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* fix manifest embedding for VS 2012, VS 2013 and VS 2015Joerg Bornemann2015-06-092-2/+2
| | | | | | Change-Id: I1fe1eeb31cb8e6b47c1437f62714f07d5675e899 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* QtScript: Fix build with MSVC2015.Friedemann Kleint2015-05-263-2/+4
| | | | | | | | | | - Remove os-win32 from the include path since the system headers are now sufficient. - Introduce some #if depending on version for traits and snprintf(). Change-Id: I290b2260e3c1595a7940c76ec2d9a4372709b156 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> (cherry picked from qtscript/c095135d047db6190beafab48d083b00ec82f2d8)
* Add Missing Debug Operator Declaration for QTouchEvent::TouchPointv4.8.7Kalle Viironen2015-05-061-0/+2
| | | | | | | | | Debug operator for QTouchEvent::TouchPoint was added in fa81aa6d027049e855b76f5408586a288f160575 but that commit was missing the declaration. Change-Id: I1bce5f131c5995e0696babe3172cbba95704ac5d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* QNAM: Fix upload corruptions when server closes connectionMarkus Goetz2015-04-287-29/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes several upload corruptions if the server closes the connection while/before we send data into it. They happen inside multiple places in the HTTP layer and are explained in the comments. Corruptions are: * The upload byte device has an in-flight signal with pending upload data, if it gets reset (because server closes the connection) then the re-send of the request was sometimes taking this stale in-flight pending upload data. * Because some signals were DirectConnection and some were QueuedConnection, there was a chance that a direct signal overtakes a queued signal. The state machine then sent data down the socket which was buffered there (and sent later) although it did not match the current state of the state machine when it was actually sent. * A socket was seen as being able to have requests sent even though it was not encrypted yet. This relates to the previous corruption where data is stored inside the socket's buffer and then sent later. The included auto test produces all fixed corruptions, I detected no regressions via the other tests. This code also adds a bit of sanity checking to protect from possible further problems. [ChangeLog][QtNetwork] Fix HTTP(s) upload corruption when server closes connection (cherry picked from commit qtbase/cff39fba10ffc10ee4dcfdc66ff6528eb26462d3) Change-Id: I9793297be6cf3edfb75b65ba03b65f7a133ef194 Reviewed-by: Richard J. Moore <rich@kde.org>
* OSX: avoid crash in invalidateBuffer_resizeHelper on parentless widgetRené J.V. Bertin2015-04-211-1/+1
| | | | | | | | | | | | KDE4 has a KMenu::addTitle function that adds a distinctive item to a menu, as the predecessor to Qt5's QMenu::addSection. On OS X this function leads to a null pointer access because invalidateBuffer_resizeHelper is called on a parentless widget. This patch filters out such widgets. Task-number: QTBUG-41716 Change-Id: I8f62a14d201ce44e038ceff87ee5db98277f1b87 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Update bundled libpng to version 1.6.17Eirik Aavitsland2015-04-1330-8827/+17669
| | | | | | | | | Merged in the upstream version, which obsoleted many of the local patches. The remaining diff to clean 1.6.17 is archived in the qtpatches.diff file. Change-Id: Ibe6f69d9002adb1ad1c4037670a3a4358ad1a18e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update bundled libtiff to version 4.0.3Eirik Aavitsland2015-04-12207-40035/+17371
| | | | | | | | | | | This updates libtiff.pri and 3rdparty/libtiff to the current state in the Qt 5 qtimageformats module, commit c3035a1655090b0f6b194fb8a7586c013ef24f6a. The patch history relative to upstream 4.0.3 is available in that module. Change-Id: I70d278081c62ba179c5f9658a0d59313c77ba415 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Update obsolete external URLsTopi Reinio2015-04-1132-160/+155
| | | | | | | | Update external URLs in the documentation for links where the resource is still available online. Change-Id: I99e5d6d7e030f93c3fe8d31cf300077e2897649e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* don't return false when a null pointer is expectedJoerg Bornemann2015-04-101-1/+1
| | | | | | Task-number: QTBUG-44748 Change-Id: I29616fdba5f0fefad3366563e12986cafa6266d6 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Remove filterIncludePath and filterLibraryPath usage.Lisandro Damián Nicanor Pérez Meyer2015-04-091-2/+2
| | | | | | | | They are only defined in qt5's configure script. Task-number: QTBUG-45463 Change-Id: Ibce2bd1d06e35de5174b15919c939b41cf013d05 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add detection of and support for Visual Studio 2015Joerg Bornemann2015-04-098-4/+151
| | | | | | | | Backport of qtbase/ce1c53b4. Task-number: QTBUG-45100 Change-Id: I10db5cfca9976bc37e86b415c2b6e10f51ec5eeb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Update copyright headersAkseli Salovaara2015-03-3111866-121102/+121798
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Improve digitToCLocale sign char handlingSamuel Gaist2015-03-301-2/+2
| | | | | | | | | | | | | | | | This patch adds more char tests for the plus and minus signs to ensure that e.g. number input widgets can be used with the locale and the known sign chars. [ChangeLog][QtCore] Fixed a bug that caused negative number input using '-' to be rejected because the current locale uses e.g. 0x2212. QIntValidator and QDoubleValidator now accepts both signs as well as the locale minus sign. Task-number: QTBUG-35069 (cherry picked from commit qtbase/dc80838a378268a13ccbe74b481528f1ad631918) Change-Id: I924bebe51028c58454eb864ad07d4af5efe3b5c9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Assistant: Fix index updating on startup in the remote control modeAlexander Volkov2015-03-261-2/+4
| | | | | | | | | | | HelpEngineWrapper::initialDocSetupDone() should be called only once right after the initialization of the help models. Calling it on every small update leads to recursion. Task-number: QTBUG-36850 (cherry picked from qttools/d55407822eefbc05f7d8bb44c53b057332b5b399) Change-Id: I3e0390e592069a417d88fbc202a1e45cd91cc139 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Identify XButton1|2 release events when mouse is moving.Matteo Bertini2015-03-261-0/+6
| | | | | | | | | | | X11 has no special state for XButton1 and XButton2, so we need to look at the global `mouseButtonState` and restore the buttons after a mouse move. Task-number: QTBUG-40148 Change-Id: I789f32b344cf7902b1c7aa6b7da7f20f32602be2 Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* fix qmake warning about unknown /Zc:strictStrings optionJoerg Bornemann2015-03-201-0/+2
| | | | | | | | | Make /Zc:strictStrings known to qmake's MSVC compiler option parser. Change-Id: I5a4494096fc1d67c96c6de52bb0f1e94eff46136 (cherry picked from commit qtbase/55f88e6e310ceb99bef31ed8d884deaa55c78d91) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use qSwap instead of std::swap so platforms without STL still compileAndy Shaw2015-03-201-1/+1
| | | | | Change-Id: Ieee4c1e795b13b3c2fd26d05c5655b4b596bd061 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* qmlplugindump: Fix build with mingw.orgKai Koehne2015-03-181-3/+5
| | | | | | | This is a backport of qtbase commits 3f1156ee5f, 802a996693. Change-Id: I26ae5be5e8294854fc26e8a084b69045ade4a3dd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* configure: add '-psql_config' optionPeter Seiderer2015-03-131-4/+9
| | | | | | | | | | | | | Allow setting of pg_config path for cross compilation where pg_config is not in the command search path (do the same as for mysql_config). This is e.g. used for buildroot (see [1] for details). Patch is backported from qtbase/a59028d6e98bcf5a13c9103753e5e83c362c63bc. [1] http://lists.busybox.net/pipermail/buildroot/2015-March/121654.html Change-Id: If2cce9c8e9e3f87bcbe80fcccacad881ec14b476 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fixes crash in bmp and ico image decodingEirik Aavitsland2015-03-132-7/+8
| | | | | | | | | Fuzzing test revealed that for certain malformed bmp and ico files, the handler would segfault. Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe (cherry picked from qtbase/2adbbae5432aa9d8cc41c6fcf55c2e310d2d4078) Reviewed-by: Richard J. Moore <rich@kde.org>
* Fixes crash in gif image decoderEirik Aavitsland2015-03-131-0/+2
| | | | | | | | | Fuzzing test revealed that for certain malformed gif files, qgifhandler would segfault. Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1 (cherry picked from qtbase/ea2c5417fcd374302f5019e67f72af5facbd29f6) Reviewed-by: Richard J. Moore <rich@kde.org>
* Simplify calculation of week numberLars Knoll2015-03-111-50/+17
| | | | | | | | | This also removes a dependency to 3rd party licensed code. Backport of a29b7635bd1d58b29fca96bd3e7831d0ee1f6666 in Qt 5. Change-Id: I647457d7787eed6d5bfc31de4816e68a9f236239 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Configure: Fix detection of GCC 5Rex Dieter2015-03-091-2/+7
| | | | | | | | | | | | - Backport qt5 commit 9fb4c2c412621b63c06dbbd899f44041b2e126c2 - fix webkit feature enablement - set QT_BUILD_KEY (same as gcc4), Qt5 has no QT_BUILD_KEY so no change there is necessary Change-Id: Ie131be711a774052bc42f18e8090b2a3dde69475 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
* Update Hebrew translation for linguist and qtconfigOrgad Shaneh2015-03-052-11/+11
| | | | | | Change-Id: Ic19596ddc1da75a11c7a52dc07266e05b43643c8 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Genghis Khan <genghiskhan@gmx.ca>
* Info.plist.lib whitespace fixupMorten Johan Sørvig2015-03-046-18/+18
| | | | | Change-Id: I2fed6342004218f4173c0ef72130b710d1a0f0c8 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* QGLWidget and re-parentingTimur Pocheptsov2015-03-021-1/+1
| | | | | | | | | | | | | | On OS X we have QWidgetPrivate::glWidgets list to track all child gl-widgets and this propagates though all the widget's tree, starting from QGLWidget and up to the top-level window ('isWindow'). It can happen, that some of widgets in a chain is becoming a window (but still has a parent) - this results in QGLWidget's destructor failing to remove 'this' from one of ancestors (since it stops on the first 'isWindow' ancestor). Modify QWidgetPrivate::setParent_sys that it does NOT add glWidgets into the parent's glWidgets, if this widget isWindow itself. Change-Id: I4bf4a927a4e43537355fdcdef465638c91e9f956 Task-number: QTBUG-20652 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* Fix compiler warnings in Qt Designer.Friedemann Kleint2015-03-022-2/+1
| | | | | | | | | shared/widgetdatabase.cpp:371:66: warning: typedef 'NameItemMap' locally defined but not used [-Wunused-local-typedefs] tools/designer/src/lib/shared/previewmanager.cpp:820:16: warning: converting ‘false’ to pointer type ‘QWidget*’ [-Wconversion-null] Task-number: QTBUG-44747 Change-Id: I9781a8cbce1def5229fe0ed7071c04ae6880b039 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Simplify mirroring code and add tests for non-aliged 1 bit imagesLaszlo Agocs2015-02-272-89/+225
| | | | | | | | Like it is done in Qt 5. Also add the autotest which was completely missing in Qt 4. Change-Id: Iaf89272b4e5b7f377c4b2f1ce929661f3d0edd9a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix Carbon buildAndy Shaw2015-02-271-1/+1
| | | | | Change-Id: Iae9445d1777ffced3d998e3f9a0a57117fa8d192 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Fix a division by zero when processing malformed BMP files.Richard J. Moore2015-02-261-0/+6
| | | | | | | | | | | This fixes a division by 0 when processing a maliciously crafted BMP file. No impact beyond DoS. Backport of 661f6bfd032dacc62841037732816a583640e187 Task-number: QTBUG-44547 Change-Id: I43f06e752b11cb50669101460902a82b885ae618 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Correct typo in the Gujarati openType identififer.Michael Brüning2015-02-241-1/+1
| | | | | | | | Based on testing by Paresh Adhia. Task-number: QTBUG-44568 Change-Id: I11c9e304282ca5afbdb02a37c366a331a4f24b04 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fix Focus problem with QX11EmbedWidgetYikei Lu2015-02-161-0/+3
| | | | | | | | | Since QX11EmbedWidget can be included in another Qt application which has QX11EmbedContainer, QX11EmbedWidget should be activated at first. Task-number: QTBUG-3617 Change-Id: I23e12f6c3ed9f7bd4a3ac0d0237bf7382db14ee2 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Don't leak RENDER Pictures in QPixmap::paintEngine().Pierre-Loup A. Griffais2015-02-131-3/+5
| | | | | | | | Qt 5 doesn't use serverside pixmaps, so doesn't need this patch. Change-Id: I5ad456679efd3706582dd1e6ca8e6b4404298739 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Backport implementation of OS X QSystemTrayIcon from Qt 5Samuel Gaist2015-02-121-62/+110
| | | | | | | | | | | | This patch aims to bring support of OS X >= 10.8 notification center and update the growl support code. [ChangeLog][OS X][Nofication] Added support for OS X 10.8 and upper notification center. Task-number: QTBUG-21830 Change-Id: Iad19c5e3a915e2caf15730a27ac762c9c11e493c Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* QThread: fix race when setting the eventDispatcherAndy Shaw2015-02-083-0/+7
| | | | | | | | | Use QMutexLocker to make this thread-safe. Task-number: QTBUG-29452 (cherry picked and adapted from qtbase/f4609b202208fe592d24c7ae3b4a48ee83045497) Change-Id: I5caf71d9a5dc6e3d655eac84426a0c5592772235 Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
* Fix QLineF Detailed DescriptionSamuel Gaist2015-02-061-1/+1
| | | | | | | | | | Currently angle() is used in place of angleTo() to describe the difference with intersect. This patch fixes that. Task-number: QTBUG-44309 Change-Id: Idfc521932247f76fe15fd980ff8e87e52feec1f1 (cherry picked from qtbase/7dd0ea7b644fe63ef57a9e7b30a9fd5312159e40) Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* QDeclarativeTextEdit: fix use of uninitialised value.David Faure2015-02-041-1/+1
| | | | | | | | | | | Detected by valgrind: ==27068== Conditional jump or move depends on uninitialised value(s) ==27068== at 0x70C7289: QDeclarativeTextEdit::updateTotalLines() (qdeclarativetextedit.cpp:1742) Backport from qtquick1 Change-Id: Iafc0c0072e6ab318fd4643e8ac7531edf5ec7ad0 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix a translation for zh_CNLiang Qi2015-02-031-1/+1
| | | | | | Task-number: QTBUG-32452 Change-Id: I78e70732f03be9b94ceb9efaab72f3693d6dd523 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* *.sln not generated correctly for VS2012 and VS2010Katja Marttila2015-02-021-4/+4
| | | | | | | | | | msbuild fails to build project since sln not generated correctly Task-number: QTBUG-33446 Change-Id: If92ea743b1b407446873210090aa8591a491abad (cherry picked from qtbase/3515365b9843b12e488880a0685b71f7b3250c33) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Added check if fontEngine is still in the cache.David Weisgerber2015-01-291-1/+1
| | | | | | Task-number: QTBUG-22942 Change-Id: I9e4ac72168886769993cb19fac7a370c377ff3af Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fix wrong Japanese translationTakumi Asaki2015-01-291-3/+2
| | | | | | | | | | Translation in Qt5 is already fixed in qttranslations/16d5447febe09fcb44be6cdb77e03ffb80238bd9. Task-number: QTBUG-44081 Change-Id: I114a402573f47df604d529407774d44ac3c419f1 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix bugs generating PDF on CocoaJames Turner2015-01-292-3/+67
| | | | | | | | | | Provide real implementations of: properties(), faceId() and getUnscaledGlyph Task-number: QTBUG-10094 Change-Id: Ib84a7a5c9e29e4d634b47bc2856787b2482048da (cherry picked from qtbase/517fb9026896f7ac20376f253babae5a7c57721d) Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Use qt.io rather than qt-project.org for network testsShawn Rutledge2015-01-283-3/+3
| | | | | | | | Mainly because of a change in certificates which is causing failing tests. Cherry-picked from https://codereview.qt-project.org/104619/ Change-Id: I8304e5ac4107428a250b71be5df7b5399a811017 Reviewed-by: Richard J. Moore <rich@kde.org>
* Bump year to 2015Kai Koehne2015-01-1528-51/+51
| | | | | | | Bump year to 2015 in all but source code comments. Change-Id: I1dd7972dee65a86a9bd560ead32bbd0cbe82f439 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Ignore expired certificate during certificate validationAndy Shaw2015-01-141-19/+12
| | | | | | | | | | | | | | | | | | | | | | | OpenSSL has a bug when validating a chain with two certificates. If a certificate exists twice (which is a valid use case for renewed CAs), and the first one it hits is expired (which depends on the order on data structure internal to OpenSSL), it will fail to validate the chain. This is only a bandaid fix, which trades improved chain validation for error reporting accuracy. However given that reissuing of CA certs is a real problem that is only getting worse, this fix is needed. See also: https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html#WARNINGS [ChangeLog][QtNetwork][QSslSocket] Added a workaround to an OpenSSL problem that may cause errors when the trust store contains two certificates of the issuing CA, one of which is expired. Task-number: QTBUG-38896 (cherry picked and adapted from qtbase/0065b55da42b8c6ee0095264b5275fb708887c9d) Change-Id: I2515d79a442bec96734ea88ea850e6e8c2123a6c Reviewed-by: Richard J. Moore <rich@kde.org>
* Doc: Update copyright information in documentation templatesTopi Reinio2015-01-1414-32/+32
| | | | | | | | - Update copyright year to 2015 - Update copyright holder to The Qt Company Ltd Change-Id: I2ed489f82639c93344051de38491183987a743e1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Update GitIgnoreOrgad Shaneh2015-01-121-0/+5
| | | | | | | Add webkit artifacts Change-Id: Ifeb9f0fdf4651183400719f46257dd430b57b362 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Update Hebrew translationOrgad Shaneh2015-01-121-305/+305
| | | | | | | | All covered except XmlPatterns Change-Id: I71097ac3263ec720efadfc9973132c52d4703d2d Reviewed-by: Genghis Khan <genghiskhan@gmx.ca> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Introduce Windows version 10.Friedemann Kleint2015-01-102-0/+6
| | | | | | | | | | Detect OS kernel version 10.0 as Windows 10. Task-number: QTBUG-43413 Change-Id: I39307cf8cc2e7cc209d6a88b8576db87086fa20e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from qtbase/b495a27d4e28ed19b00557dbaf8ab5d31c21ae4f) Reviewed-by: Lars Knoll <lars.knoll@digia.com>
View Lorry Controller Status