qt:qt.git
7 years agoCorrect typo in the Gujarati openType identififer.
Michael Brüning [Mon, 23 Feb 2015 10:53:13 +0000 (11:53 +0100)]
Correct typo in the Gujarati openType identififer.

Based on testing by Paresh Adhia.

Task-number: QTBUG-44568
Change-Id: I11c9e304282ca5afbdb02a37c366a331a4f24b04
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
7 years agoFix Focus problem with QX11EmbedWidget
Yikei Lu [Thu, 12 Feb 2015 12:21:50 +0000 (21:21 +0900)]
Fix Focus problem with QX11EmbedWidget

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>
7 years agoDon't leak RENDER Pictures in QPixmap::paintEngine().
Pierre-Loup A. Griffais [Sat, 18 May 2013 03:18:01 +0000 (20:18 -0700)]
Don't leak RENDER Pictures in QPixmap::paintEngine().

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>
7 years agoBackport implementation of OS X QSystemTrayIcon from Qt 5
Samuel Gaist [Sun, 20 Jul 2014 14:41:27 +0000 (16:41 +0200)]
Backport implementation of OS X QSystemTrayIcon from Qt 5

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>
7 years agoQThread: fix race when setting the eventDispatcher
Andy Shaw [Fri, 6 Feb 2015 09:50:29 +0000 (10:50 +0100)]
QThread: fix race when setting the eventDispatcher

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>
7 years agoFix QLineF Detailed Description
Samuel Gaist [Thu, 5 Feb 2015 23:07:29 +0000 (00:07 +0100)]
Fix QLineF Detailed Description

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>
7 years agoQDeclarativeTextEdit: fix use of uninitialised value.
David Faure [Mon, 2 Feb 2015 13:34:00 +0000 (14:34 +0100)]
QDeclarativeTextEdit: fix use of uninitialised value.

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>
7 years agoFix a translation for zh_CN
Liang Qi [Tue, 3 Feb 2015 08:26:52 +0000 (09:26 +0100)]
Fix a translation for zh_CN

Task-number: QTBUG-32452
Change-Id: I78e70732f03be9b94ceb9efaab72f3693d6dd523
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
7 years ago*.sln not generated correctly for VS2012 and VS2010
Katja Marttila [Mon, 2 Feb 2015 15:57:32 +0000 (16:57 +0100)]
*.sln not generated correctly for VS2012 and VS2010

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>
7 years agoAdded check if fontEngine is still in the cache.
David Weisgerber [Sun, 25 Jan 2015 11:47:31 +0000 (12:47 +0100)]
Added check if fontEngine is still in the cache.

Task-number: QTBUG-22942
Change-Id: I9e4ac72168886769993cb19fac7a370c377ff3af
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
7 years agoFix wrong Japanese translation
Takumi Asaki [Tue, 27 Jan 2015 06:54:40 +0000 (15:54 +0900)]
Fix wrong Japanese translation

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>
7 years agoFix bugs generating PDF on Cocoa
James Turner [Sat, 17 Jan 2015 16:31:20 +0000 (22:01 +0530)]
Fix bugs generating PDF on Cocoa

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>
7 years agoUse qt.io rather than qt-project.org for network tests
Shawn Rutledge [Tue, 27 Jan 2015 13:42:35 +0000 (14:42 +0100)]
Use qt.io rather than qt-project.org for network tests

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>
7 years agoBump year to 2015
Kai Koehne [Tue, 13 Jan 2015 13:44:50 +0000 (14:44 +0100)]
Bump year to 2015

Bump year to 2015 in all but source code comments.

Change-Id: I1dd7972dee65a86a9bd560ead32bbd0cbe82f439
Reviewed-by: Martin Smith <martin.smith@digia.com>
7 years agoIgnore expired certificate during certificate validation
Andy Shaw [Wed, 14 Jan 2015 21:47:55 +0000 (22:47 +0100)]
Ignore expired certificate during certificate validation

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>
7 years agoDoc: Update copyright information in documentation templates
Topi Reinio [Wed, 14 Jan 2015 11:01:51 +0000 (12:01 +0100)]
Doc: Update copyright information in documentation templates

    - 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>
7 years agoUpdate GitIgnore
Orgad Shaneh [Sun, 11 Jan 2015 21:38:52 +0000 (23:38 +0200)]
Update GitIgnore

Add webkit artifacts

Change-Id: Ifeb9f0fdf4651183400719f46257dd430b57b362
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
7 years agoUpdate Hebrew translation
Orgad Shaneh [Sun, 21 Dec 2014 19:23:08 +0000 (21:23 +0200)]
Update Hebrew translation

All covered except XmlPatterns

Change-Id: I71097ac3263ec720efadfc9973132c52d4703d2d
Reviewed-by: Genghis Khan <genghiskhan@gmx.ca>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
7 years agoIntroduce Windows version 10.
Friedemann Kleint [Fri, 19 Dec 2014 09:58:34 +0000 (10:58 +0100)]
Introduce Windows version 10.

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>
7 years agoFix empty arrays in QML 1
Robert Griebl [Thu, 8 Jan 2015 15:33:34 +0000 (16:33 +0100)]
Fix empty arrays in QML 1

Commit bb0239e added a regression, where empty arrays would produce errors
in QML 1.

Task-number: QTBUG-43656
Change-Id: I6d416b2387a1dfd3588c000368fc1223d08399bd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoWindows: Fix OS version determination for Windows >= 8
Friedemann Kleint [Fri, 19 Dec 2014 10:07:47 +0000 (11:07 +0100)]
Windows: Fix OS version determination for Windows >= 8

First, try to determine the version of kernel32.dll by
using the version API. If that fails, loop using the
version macros, taking the major version into account.

Hangs in the minor version loop have been observed, potentially
related to the major version.

Task-number: QTBUG-43413
Change-Id: I982e78873510e7598c7cf839177e59812acd86f6
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
(cherry picked from qtbase/6796f2337ee31b4b4f07eaa54d868b999c39233a)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
7 years agoQDateTime: Fix time format in doc
Orgad Shaneh [Sat, 3 Jan 2015 16:59:39 +0000 (18:59 +0200)]
QDateTime: Fix time format in doc

MM stands for month, SS is invalid

Task-number: QTBUG-12236
Change-Id: I9b4a57d05d77fd38db30b53b16c382ea545edb80
(cherry picked from qtbase/a457bf3ff73627aa2c95f0482a838b14fd3233a0)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
7 years agoFix compilation with QDND_DEBUG.
Friedemann Kleint [Tue, 6 Jan 2015 15:40:15 +0000 (16:40 +0100)]
Fix compilation with QDND_DEBUG.

Task-number: QTBUG-43466
Change-Id: I9a8ef1f33635469f12d259af9716eb60b650a9de
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
7 years agoAdd Hebrew translation for Qt Linguist
Orgad Shaneh [Sat, 20 Dec 2014 17:22:57 +0000 (19:22 +0200)]
Add Hebrew translation for Qt Linguist

Started-by: Genghis Khan <genghiskhan@gmx.ca>
Change-Id: I761e104437ea99cbb1a44f3571824546a9b19a18
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Genghis Khan <genghiskhan@gmx.ca>
7 years agoCheck world matrix is true when seeing if transformations are supported
Andy Shaw [Fri, 19 Dec 2014 14:23:12 +0000 (15:23 +0100)]
Check world matrix is true when seeing if transformations are supported

If the world matrix is turned off then if the raster paintengine should
not support transformations for the text as otherwise it could end up
being incorrectly transformed.

Task-number: QTBUG-35200
Change-Id: I68fa6654ee87016986ba9d9469673fc8b9e0875e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
7 years agoQIdentityProxyModel: remove slow bounds-checking, for more performance
David Faure [Fri, 31 Oct 2014 16:18:47 +0000 (17:18 +0100)]
QIdentityProxyModel: remove slow bounds-checking, for more performance

If we're called out of bounds, sourceModel()->index() will take care of
returning an invalid model index anyway. So calling rowCount+columnCount
every time index() is called can be avoided. These calls can be particularly
slow when sitting on top of a stack of proxymodels. And index() itself is called
very often, i.e. when a proxymodel on top of us is used by a delegate
which calls data() for many different roles.

Change-Id: I00dd5cf432c0591f41e6fa6fc86c845f29845cd1
(cherry picked from qtbase/3de0f442b5857915f26be6600bc8e54d1af08208)
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
7 years agoAutotest: Setting tst_qaudiooutput and tst_qsound as insignificant
Simo Fält [Mon, 22 Dec 2014 08:01:46 +0000 (10:01 +0200)]
Autotest: Setting tst_qaudiooutput and tst_qsound as insignificant

These always fails on virtual Mac CI nodes.

Task-number: QTBUG-43507
Change-Id: I8f8fab92693aea7c797eee4e930c8ed5e82954c9
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
7 years agoUse metrics returned by GetGlyphOutline in GGO_METRICS mode
lasconic [Thu, 18 Sep 2014 07:44:03 +0000 (13:14 +0530)]
Use metrics returned by GetGlyphOutline in GGO_METRICS mode

GetGlyphOutline Windows API returns wrong values when used with an
OpenType PS font and in GGO_NATIVE mode. It causes problem when
exporting to PDF. The fix changes the GetGlyphOutline call to use
GGO_METRICS instead.

Task-number: QTBUG-12799
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Change-Id: I38ca46d50e490e3b704a89d08b1a8697bca5f079
(cherry picked from qtbase/4aba2d07d2fe67beaf544a4b38c5b9aa8b8ec39b)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
7 years agoFix OpenType fonts with cmap tables on Windows
Josh Faust [Mon, 10 Jun 2013 18:42:01 +0000 (00:12 +0530)]
Fix OpenType fonts with cmap tables on Windows

Task-number: QTBUG-31656
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Change-Id: If941bddb6173b6bd93117ba5bd35fa4050f29e3d
(cherry picked from qtbase/0a170be576153b84ee6249f1a2b7cbce1ef10d84)

7 years agoMake distance fields rendering work with Opentype CFF fonts
Eskil Abrahamsen Blomfeldt [Fri, 21 Dec 2012 14:23:28 +0000 (19:53 +0530)]
Make distance fields rendering work with Opentype CFF fonts

If the font has a CFF table, GDI will not label it as
TMPF_TRUETYPE, however, we can still use GetFontData to get
the SFNT tables. This is required to get the maxp table which
contains the glyph count, which is required to use the font
with the distance-field renderer.

Task-number: QTBUG-28746
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Change-Id: I1e084f7e9dbd0bccb9b1ff4de2eaf65d6a5f9f1e
(cherry picked from qtbase/dde09c429ae8b7ad0df4e4b36b8459d2b85a1219)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
7 years agofix glyph's CMAP index might be corrupted
Konstantin Ritt [Mon, 7 May 2012 23:57:34 +0000 (05:27 +0530)]
fix glyph's CMAP index might be corrupted

when SMP sybmol is present in the font.
this is a simple typo fix, actually

Change-Id: I34fc01171f2893d36d36cc929b4f1a789a5f36db
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
(cherry picked from qtbase/51998eb4f65b92640176973ba0e0ed14adee561d)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
7 years agofix QWebSettings::setUserStyleSheetUrl() not working with windows paths
Ashish Kulkarni [Mon, 5 May 2014 12:39:18 +0000 (18:09 +0530)]
fix QWebSettings::setUserStyleSheetUrl() not working with windows paths

QWebSettings::setUserStyleSheetUrl() does not work with windows paths
that contain drive letters.

KURL::path() alone does not handle removing the leading slash from a
windows file path. Using QUrl::toLocalFile() will turn
​file:///C:/path into C:/path appropriately

This fixes https://bugs.webkit.org/show_bug.cgi?id=34884.

Change-Id: I37a1482b67447be6ea6a10966cf59c9159db83cd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
7 years agoFixed a bug where spans did not always work in layouts.
Jan Arve Saether [Tue, 9 Dec 2014 12:26:18 +0000 (13:26 +0100)]
Fixed a bug where spans did not always work in layouts.

The problem was that the span we stored in the multiCellMap was the
"effective" span (i.e.  the given span subtracted with the number of
ignored rows it would span). Later we used that span to distribute its
size across all its cells.  However, since the span now could be smaller
that the given span, we could sometimes fail to distribute to the last
span(s).

[ChangeLog][QtWidgets][layouts] Fixed a bug where spans sometimes didn't
distribute themselves to the last cells they covered.

Change-Id: I7bfbbe721f0ec4398be6a5f234c109ddfec18514
Task-number: QTBUG-43099
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
(cherry picked from qtbase/c9db6e52bc9bd9731159fcb4e95fca5cba01bc9c)

7 years agoWindows: Fix return value of QDesktopServices::storageLocation(DataLocation).
Friedemann Kleint [Thu, 4 Dec 2014 08:09:30 +0000 (09:09 +0100)]
Windows: Fix return value of QDesktopServices::storageLocation(DataLocation).

Return empty string if SHGetSpecialFolderPath() fails for DataLocation, ie,
the directory does not exist.

Change-Id: I2abf41174b904fe36e587894832c0f3f4947dc1e
Task-number: QTBUG-43092
Reviewed-by: David Faure <david.faure@kdab.com>
7 years agoRewrite debug output of event classes.
Friedemann Kleint [Fri, 1 Aug 2014 09:03:22 +0000 (11:03 +0200)]
Rewrite debug output of event classes.

Bring debug formatting in Qt 4 on par with Qt 5.4:
- Introduce functions to return class name and type name by type.
- Add verbose output for DnD, tablet, native gestures and context
  menu, events.

Task-number: QTBUG-38858
Task-number: QTBUG-42344

[ChangeLog][QtGui][QEvent] The debug output for events has
been significantly improved.

Change-Id: I3f11e34c3c9d6a3c6db596be4051b801f00e6153
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
(cherry picked from qtbase/14f9c09542bd6cc19430473da9ce4c68f239ec7d)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
7 years agoBump Qt version to 4.8.7
Akseli Salovaara [Mon, 1 Dec 2014 13:27:34 +0000 (15:27 +0200)]
Bump Qt version to 4.8.7

Change-Id: Icd6fcdb59eb1b9fd8de555ef1c1c87a379f06a27
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
7 years agoAuto-scroll while selecting entire rows/columns did not work
Jan Arve Saether [Thu, 23 Oct 2014 08:30:39 +0000 (10:30 +0200)]
Auto-scroll while selecting entire rows/columns did not work

If you press and hold a section in a header view you can extend the
selection to more rows by moving the mouse. This worked fine until you
moved the mouse outside the geometry of the header view. The expected
behavior was then to scroll the view (this is what happens with extended
selections on regular table cells).

[ChangeLog][QtWidgets][QHeaderView] Auto-scroll the view when making
extended row/column selections.

Change-Id: Ic65aa34d370e74054b2123ab57edb1add0e8adb9
Task-number: QTBUG-21201
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
(cherry picked from qtbase/f9408317e70bc2e635a2f9baeff35d1c06227734)

7 years agoFix minor compiler warning
Kevin Funk [Thu, 27 Nov 2014 19:32:50 +0000 (20:32 +0100)]
Fix minor compiler warning

Change-Id: Ifb0e8c7998ca2b4cba9ce4a34655614d7cefb860
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
7 years agoOnly add the res_file to the generated files if there is no rc_file
Andy Shaw [Tue, 2 Jul 2013 12:44:53 +0000 (14:44 +0200)]
Only add the res_file to the generated files if there is no rc_file

If both the rc_file and res_file was added to the project then in MSVC
2012 it would cause an error complaining of a duplicated resource.

Task-number: QTBUG-29826
Change-Id: Ib3401b423208cd8c90895038c9cbadd80c39b542
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/fa1fb5ed945650d45cf9b61906232cfbae11360e)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
7 years agoRemove the use of a template qUnused function for ICC
Thiago Macieira [Fri, 11 Nov 2011 19:55:46 +0000 (17:55 -0200)]
Remove the use of a template qUnused function for ICC

ICC 12 does not seem to need this.

Change-Id: I98e9d530e767c4d24424f0c2b5d763f863e85fe4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
(backported from qt5/qtbase d3951a5b0f4fe9731d1512668b43f51bd98bd84e)
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
7 years agoFix string placeholders in two translations
Andy Shaw [Mon, 24 Nov 2014 11:02:05 +0000 (12:02 +0100)]
Fix string placeholders in two translations

As the translation in Qt 5 is more out of date this is being fixed
directly in the Qt 4.8 version as this is more accurate.

Change-Id: Ie7abbd224e26f8af63d80acd81ddf2973b39e0d4
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
7 years agoFix thai symbol rendering slowness
Konstantin Ritt [Thu, 20 Nov 2014 13:41:05 +0000 (19:11 +0530)]
Fix thai symbol rendering slowness

Harfbuzz is constantly trying to load libthai in
src/3rdparty/harfbuzz/src/harfbuzz-thai.c,
making rendering of thai symbols very slow.

Task-number: QTBUG-37665
Change-Id: I30a2a5489271534eeacc205d8106b22130c40c5f
(cherry picked from qtbase/47e6ec0736aa129e181e0b6f02cec884f9832432)
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
7 years agoParse multiple buttons during mouse press and release
Allan Sandfeld Jensen [Fri, 31 Oct 2014 12:43:32 +0000 (13:43 +0100)]
Parse multiple buttons during mouse press and release

Copies the logic for parsing mouse buttons from Qt5 QtWebKit so that
button clicks when another button is held works.

Task-number: QTBUG-42319
Change-Id: If56e20533531fe949eef444eb7e2f747907f5bcc
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
7 years agoAdjust the layout if a QGraphicsWidget is explicitly hidden
Jan Arve Saether [Mon, 20 Oct 2014 13:40:18 +0000 (15:40 +0200)]
Adjust the layout if a QGraphicsWidget is explicitly hidden

Task-number: QTBUG-20132
Change-Id: Iab59fc9b61d4ca1bb2208c479a027da6eb0283a9
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
(cherry picked from qtbase/bf200fc948d89e1a735a8bcca879654028f944d2)

7 years agoFix compiler warning
Lars Knoll [Thu, 30 Oct 2014 08:58:23 +0000 (09:58 +0100)]
Fix compiler warning

Already fixed in Qt 5

Task-number: QTBUG-42032
Change-Id: I7ed7d955115e875468b94759bda44f99b737e7cb
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
7 years agoHandle relative paths correctly for files in QMAKE_BUNDLE_DATA
Andy Shaw [Wed, 2 Oct 2013 12:58:35 +0000 (14:58 +0200)]
Handle relative paths correctly for files in QMAKE_BUNDLE_DATA

Partially cherry pick from f6bd02317db7beadda1237df7feddd4a780415cb
from Qt 5. The Qt 5 SHA1 changes a lot of different parts in the
XCode generator after a general qmake change caused some problems.
So we just pick the part needed to fix the handling of relative
paths used in files in QMAKE_BUNDLE_DATA.

Change-Id: I364f82a353dfa922591d07c2aa9061666b79de02
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
7 years agoqmake vcxproj generator: write PrimaryOutputExtension value
Joerg Bornemann [Tue, 21 Oct 2014 11:47:16 +0000 (13:47 +0200)]
qmake vcxproj generator: write PrimaryOutputExtension value

Second attempt. MSVCPROJ_TARGET contains the resolved target name,
including version number and target extension.
We're splitting this value into PrimaryOutput and
PrimaryOutputExtension.
PrimaryOutputExtension is only written if it contains a non-default
value.

Task-number: QTBUG-26782
Change-Id: I4b828dc5dd47322f653585aee1a5767f0cf8bd48
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
(cherry picked from commit qtbase/d1e950b919615c1ae754e07899f1b45303c17654)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
7 years agofix warning when generating VS 2013 project
Joerg Bornemann [Tue, 11 Feb 2014 13:10:00 +0000 (14:10 +0100)]
fix warning when generating VS 2013 project

/FS forces the compiler to synchronize pdb file writes.
This option is not needed when building with Visual Studio itself.
Still, qmake needs to know it when parsing the compiler flags.

Task-number: QTBUG-36535
Change-Id: Id5b68c4028844e0b95904e08b5121310a4ff13d6
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
(cherry picked from commit qtbase/9b59e51c5064c67c423389c2c884d009903910c7)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
7 years agoWindows native socket: handle WSAENETRESET the same as WSAECONNRESET
Shawn Rutledge [Wed, 22 Oct 2014 07:31:54 +0000 (09:31 +0200)]
Windows native socket: handle WSAENETRESET the same as WSAECONNRESET

Backported from Qt 5.

Task-number: QTBUG-41934
Change-Id: I4cebfb4b5f6e400b54cab3271af4411becd91b9f
Reviewed-by: Richard J. Moore <rich@kde.org>
7 years agoFix license text and URLs in QMessageBox::aboutQt().
Friedemann Kleint [Mon, 6 Oct 2014 14:39:12 +0000 (16:39 +0200)]
Fix license text and URLs in QMessageBox::aboutQt().

Point to new qt.io site, adapt licensing text.

Task-number: QTBUG-41798
Change-Id: I492df6a842c2b31e44653fb4388408c209f24f1e
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
(cherry picked from qtbase/4a2cf9ca4174ee9879bfc5858f10dacc028a521f)
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
7 years agoQTreeView: speed up isRowHidden for the case where no rows are hidden.
David Faure [Sun, 12 Oct 2014 11:38:41 +0000 (13:38 +0200)]
QTreeView: speed up isRowHidden for the case where no rows are hidden.

isPersistent(index) is a linear search, which we can avoid altogether
(as well as the creation of a persistent model index, is idx is indeed persistent)
when the row-hiding feature isn't used at all.

Change-Id: I55ef204dd9b79a89d51d5d3aacc1c110d37a4ea0
(cherry picked from qtbase/cd824ee79188b889df85d4d648a625589655e15e)
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
7 years ago[OS X]: respect icon visibility preference in system tray menus
René J.V. Bertin [Mon, 6 Oct 2014 16:47:01 +0000 (18:47 +0200)]
[OS X]: respect icon visibility preference in system tray menus

Check the `IconVisibleInMenu` switch so that systray menu items only
show an icon if the application/user has configured things that way,
and not otherwise.

Task-number: QTBUG-41348
Change-Id: Ibb7db326fd598ca78cb95c815b5e165de2babeda
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
7 years agoQMacStyle: Fix QTabBar appearance on Yosemite
Jari Tenhunen [Sun, 5 Oct 2014 16:49:39 +0000 (19:49 +0300)]
QMacStyle: Fix QTabBar appearance on Yosemite

The selected tab text color should be white except when the
window is not active. Also, no text shadow should be rendered
in any case. Finally, there's no need to move the tab shape up
anymore.

Backport of qtbase/e9e66079b16754f1fef89c2ad93593d7d55c8654

Change-Id: Ib41b9ccb990dc5c550f5a48c855bebd39262b06e
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
7 years agoMake sure the content widget never replaces valid data with empty data.
Christian Kandeler [Fri, 26 Sep 2014 10:15:59 +0000 (12:15 +0200)]
Make sure the content widget never replaces valid data with empty data.

This could happen because insertContents() is called once for
every run of the content provider, even if an invalidation happens
in between. Example sequence:
    run()
    invalidate() [removes result of first run]
    run()
    insertContents() [queued for first run, retrieves result of second run]
    insertContents() [queued for second run, retrieves empty data]
We now check in insertContents() whether the content provider has a
valid root item and do nothing if it does not. This means that
insertContents() will never replace the current model data with empty
data; only invalidateContents() can do that from now on.
Further improvements:
    - Only call insertContents() if the run was not aborted; this
      reduces the number of useless objects in the event queue.
    - Remove the m_rootItem member; it was only used in the run() function.
    - Only add the root item to the list at the end of a successful run;
      there is no reason this object should be accessible from the outside
      while there are still children being added to it.

Change-Id: I80e2ea93dd9bbc8ab7f406c989b61f16f11b6eea
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
7 years agoUpdate Hebrew translation
Genghis Khan [Fri, 8 Aug 2014 07:04:26 +0000 (10:04 +0300)]
Update Hebrew translation

Change-Id: I9a4d4f236cfca386f717629b09a23e51baab6bd5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
7 years agoBackport: use backslashes for UNCs path
Samuel Gaist [Sun, 7 Sep 2014 21:27:47 +0000 (23:27 +0200)]
Backport: use backslashes for UNCs path

ShellExecute fails to open a share folder due to using '/' instead of '\'.

Windows API doesn't support forward slashes for extended-length path.
Extended-length path are path that start with a "\\?\" prefix. For example,
"\\?\c:\very_long_path\foo\bar.txt", or in the case of a UNC path that
would be "\\?\very_long_path\foo\bar.txt". [1]

[1] http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx#maxpath

(cherry-picked and adapted from qtbase/18c916517f3004d34482c20ed66bf09ec274d385)
Task-number: QTBUG-13359
Change-Id: I2f38ecb76d87b87dc1d40bd48c94c78550a6ca1f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
7 years agoQLineEdit: Disable standard key 'cut' when there is no selection.
Dyami Caliri [Wed, 17 Sep 2014 18:11:57 +0000 (11:11 -0700)]
QLineEdit: Disable standard key 'cut' when there is no selection.

(cherry-picked from qtbase/0aa84a619ea0a7c85a1ed48ed28817d4c7e40b33)
Task-number: QTBUG-40477
Change-Id: I48aa7ecc4ee8a8e4e9feaf9b6cba5109d2d1f725
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
7 years agoFix libmng test.
Lisandro Damián Nicanor Pérez Meyer [Sat, 23 Aug 2014 18:45:34 +0000 (15:45 -0300)]
Fix libmng test.

libmng pulls in libjpeg. In turn libjpeg requires that code that uses it should
include stdio.h [0].

[0] <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=461602#10>

So adding the corresponding include before libmng solves the issue.

(cherry picked from qtimageformats/08f40bc0f00716c3a8cbda70ed00dc2f16515e85)
Change-Id: Ib249fa9d867536c19be8e376f6c5595080cab006
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
7 years agoFix DateTime with recent versions of tzdata
Allan Sandfeld Jensen [Fri, 19 Sep 2014 12:24:44 +0000 (16:24 +0400)]
Fix DateTime with recent versions of tzdata

An backport of http://trac.webkit.org/changeset/150833 needed for
correct time KRAT, YAKT and MOS timezones.

Task-number: QTBUG-41422
Change-Id: I6e9d1db690fee8d77faa1d76c836bd7b345ce854
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
7 years agoFix crash when accessing the content model.
Christian Kandeler [Fri, 19 Sep 2014 11:48:07 +0000 (13:48 +0200)]
Fix crash when accessing the content model.

1) Make sure invalidateContents() is called whenever the help engine's
   DB readers are destroyed.
2) In QHelpContentProvider::stopCollecting(), remove all root items, as
   they are invalid now: Their child items reference DB readers that
   are going to be destroyed.

Task-number: QTBUG-18829
Change-Id: Iab3245eb9fd405f28105aa08a976d9a108b9c70a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
7 years agoOSX: make QFileDialog::getSaveFileName honor the initial file name.
Erik Verbruggen [Tue, 16 Sep 2014 11:39:25 +0000 (13:39 +0200)]
OSX: make QFileDialog::getSaveFileName honor the initial file name.

Since OSX 10.9 the NSSavePanel will call panelSelectionDidChange on the
delegate when the selection is changed programmatically, even when the
panel is not (yet) visible. This overwrites the selected file name
with the default "Untitled" before we'd set it in
runApplicationModalPanel. The fix is to check if panelSelectionDidChange
is called before it is shown.

Change-Id: I9ad6cd3afddc0aac35baebab31fd85cd7bf3f9e9
Task-number: QTBUG-36212
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
7 years agoQPdf::addImage(): avoid a QImage detach when it's in an acceptable Format
Martin Pley [Tue, 10 Jun 2014 10:53:59 +0000 (12:53 +0200)]
QPdf::addImage(): avoid a QImage detach when it's in an acceptable Format

Don't detach QImage, when it's in Format_Mono or Format_ARG32.
Use QImage::constScanLine() instead of QImage::scanLine().

Change-Id: I30fcafb576aea3189637a40fd75f77c70017ba46
Reviewed-by: John Layt <jlayt@kde.org>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
(cherry picked from qtbase/1a32cc0ae42a4a49f2d45b8ad8251ec40a30bf76)
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
7 years agoadmitting defeat
Oswald Buddenhagen [Tue, 9 Sep 2014 13:45:14 +0000 (15:45 +0200)]
admitting defeat

(cherry picked from qttranslations/b9a22c997c1a988ff8e6b52893e4673e9ac69a2b)
Change-Id: I050998c14f4053a5c006d7a0da8b8befb21902b0
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agoQListView: Catch stack overflow on mutual scrollbar calculation.
Lars Knoll [Wed, 10 Sep 2014 07:39:13 +0000 (09:39 +0200)]
QListView: Catch stack overflow on mutual scrollbar calculation.

Backport of fc4993be1fa7673016b6e5d81134463f163051f6 from Qt 5.

Task-number: QTBUG-39902
Task-number: QTBUG-38517
Change-Id: I66b2c7304423dd65d67158ae0dc70ad12e4fa783
Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
7 years agoFix font cache check in QFontEngineFT::recalcAdvances()
Miikka Heikkinen [Fri, 16 Mar 2012 09:13:55 +0000 (11:13 +0200)]
Fix font cache check in QFontEngineFT::recalcAdvances()

Cached font was used regardless of the format, resulting in incorrect
advance in some cases when default format differed from the cached
format.

Task-number: QTBUG-24188
Change-Id: I39e4156bd9ba743afa7e106e934c90227fbf2b8b
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
(cherry picked from qtbase/2ea976c3a713535c2419d936d575e0b24545f0fa)
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
7 years agoRevert previous QFileDialog fix for Solaris
Samuli Piippo [Mon, 1 Sep 2014 09:46:39 +0000 (12:46 +0300)]
Revert previous QFileDialog fix for Solaris

This reverts previous commit 6d47f5a168e350a6d9cbddb343ff9d75ffbd2c04,
that broke compilation of QFileDialog in solaris (Sun CC).

Solaris defaults to Draft version of getpwnam_r if _POSIX_C_SOURCE is not
defined or < 199506L, and _POSIX_VERSION is defined as 199506L even when
_POSIX_C_SOURCE is not used, so it cannot be used to detect correct
posix support.

Task-number: QTBUG-21451
Change-Id: Ibbf2b9de1dea74e7d8b6003d1a4e3686e5858525
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
7 years agoQSwipeGestureRecognizer: Use qAbs() to check distances.
Friedemann Kleint [Wed, 3 Sep 2014 07:40:01 +0000 (09:40 +0200)]
QSwipeGestureRecognizer: Use qAbs() to check distances.

Task-number: QTBUG-15768
Change-Id: Idc6c6687430365a015fb2c15f4e4dcae6a687f9f
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
(cherry picked from qtbase/74303ad497ff0e3a9876d349e2ce2f67f08c0fbf)

7 years agoDon't call virtual methods after the source model is destroyed.
Andreas Hartmetz [Thu, 28 Aug 2014 18:23:11 +0000 (20:23 +0200)]
Don't call virtual methods after the source model is destroyed.

Calling clear_mapping causes the persistent indexes to be queried, and
mapped using map_to_source, so that they can be restored later. That
is not the appropriate response to the source model being deleted
because there won't be anything to restore.

Simply clear the stored mapping information instead so that the source model
actually exists when mapToSource is called by the framework.

Backport of 722798a359761a1eb635d18547b076615f192508 from qt5/qtbase

Change-Id: I9c74f97855046b968dfba7a35134c234b974e63b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
7 years agoReplace all ocurrences of NSApp with [NSApplication sharedApplication].
Jake Petroules [Mon, 16 Jun 2014 11:58:29 +0000 (07:58 -0400)]
Replace all ocurrences of NSApp with [NSApplication sharedApplication].

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>
7 years agoFix AArch64/arm64 detection.
Lisandro Damián Nicanor Pérez Meyer [Wed, 20 Aug 2014 20:52:49 +0000 (17:52 -0300)]
Fix AArch64/arm64 detection.

The detection needs to go before arm, else the system will detect AArch64/arm64
as arm.

This patch comes from Wookey, he has agreed to put it under BSD or Expat
to allow it's inclusion in here:
<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255>

Change-Id: Ic2171c03fca8bb871347940fa3a2bc467776f797
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agoAllow Qt4 to also build in ppc64[el le]
Lisandro Damián Nicanor Pérez Meyer [Sat, 23 Aug 2014 18:05:34 +0000 (15:05 -0300)]
Allow Qt4 to also build in ppc64[el le]

This simple patch allows ppc64le (aka ppc64el) to build Qt4.

The original patch was done by Ubuntu's William Grant [0], but
I higly doubt this is copyrighteable.

[0] <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749743#39>

Change-Id: I4cd204e314789337e34b460dda6e18143e3712ec
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agoFix QPainter::drawPolyline() painting errors with cosmetic pen
aavit [Tue, 12 Aug 2014 11:54:17 +0000 (13:54 +0200)]
Fix QPainter::drawPolyline() painting errors with cosmetic pen

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>
7 years agoQThread snippet: add missing & from connection statement
Samuel Gaist [Thu, 21 Aug 2014 07:42:32 +0000 (09:42 +0200)]
QThread snippet: add missing & from connection statement

Change-Id: I0409feec55ebd19f80b0c2396c49b4999798ef74
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
7 years agoQMacStyle: Fix focus frame rendering in Yosemite
Jari Tenhunen [Mon, 18 Aug 2014 18:08:02 +0000 (21:08 +0300)]
QMacStyle: Fix focus frame rendering in Yosemite

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>
7 years agoMac Style: Fix QLineEdit frame in 10.10
Jari Tenhunen [Mon, 18 Aug 2014 18:02:20 +0000 (21:02 +0300)]
Mac Style: Fix QLineEdit frame in 10.10

Also removes some dead code.

Backport of 83f06da1c6bffff61af78cbe75a0691d53742b53 from qt5/qtbase

Change-Id: I7e088ca8b52bc3e2da25e29ab570469eab6f97bf
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
7 years agorefactor disconnectFromFtp to remove cached entries when necessary
Matt Broadstone [Mon, 18 Aug 2014 21:02:52 +0000 (17:02 -0400)]
refactor disconnectFromFtp to remove cached entries when necessary

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>
7 years agoqmake: Add object_parallel_to_source config option
Tor Arne Vestbø [Mon, 5 Dec 2011 14:50:43 +0000 (15:50 +0100)]
qmake: Add object_parallel_to_source config option

This solves the problem of two source files in the same project
having the same name, which ends up with colliding object files.
It also solves issues with moving files around in the source tree
when the GNUmake option is used together with gcc_MD_depends,
where the dependency file would end up with a dependency to the
old source location.

We already have object_with_source option, but that does not play
nicely with shadow-builds. The new option tries to keep the same
hirarcy in the output dir (while still respecting OBJECTS_DIR),
as the sources. Any source with a path outside of the root project
directory (absolute or relative, ../../foo.cpp), will be put inside
the objects directory with the full path appended.

Task-number: QTBUG-34871
(cherry picked from qtbase/47df12225918ba82abe35921af19e547717da58b)
Change-Id: I3481b128ed72494a644fdbc55325661a23e868fa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agoRemove use of 'register' from Qt.
Kevin Funk [Thu, 7 Aug 2014 15:42:16 +0000 (17:42 +0200)]
Remove use of 'register' from Qt.

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>
7 years agoFix Flickable mouse grab issue.
Robert Griebl [Thu, 31 Jul 2014 13:12:45 +0000 (15:12 +0200)]
Fix Flickable mouse grab issue.

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>
7 years agoAdd handling of value-type lists to QDeclarativeExpression::evaluate()
Robert Griebl [Wed, 30 Jul 2014 17:00:26 +0000 (19:00 +0200)]
Add handling of value-type lists to QDeclarativeExpression::evaluate()

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>
7 years agoFix at lot of QT_NO_ define guards for very tiny Qt builds.
Robert Griebl [Thu, 31 Jul 2014 13:10:37 +0000 (15:10 +0200)]
Fix at lot of QT_NO_ define guards for very tiny Qt builds.

Change-Id: If33639be245a1ad3782e1fde279371f330a988be
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
7 years agoFix compilation warnings due to superfluous commas at the end of enums.
Robert Griebl [Thu, 31 Jul 2014 13:29:39 +0000 (15:29 +0200)]
Fix compilation warnings due to superfluous commas at the end of enums.

Change-Id: Ibc05eec8a109d68cfa2caa64ea069d77c456c41e
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
7 years agoqmlplugindumper: do not pop up a window if an assert is triggered
Fawzi Mohamed [Wed, 30 Jul 2014 13:42:58 +0000 (15:42 +0200)]
qmlplugindumper: do not pop up a window if an assert is triggered

On windows the debug version of qmlplugindumper used to show a panel on
assert failure. Failure should be silent.

Done-with: Thomas Hartmann <thomas.hartmann@digia.com>
Task-number: QTCREATORBUG-12644
Change-Id: I568f27e7d848aeafbffa059599f33b1b7ce0d2b9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
7 years agoDon't convert signed to unsigned when we need all 32bit
Allan Sandfeld Jensen [Wed, 30 Jul 2014 08:47:03 +0000 (10:47 +0200)]
Don't convert signed to unsigned when we need all 32bit

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>
7 years agoqwidget_win.cpp: Initialize WINDOWPLACEMENT correctly.
Friedemann Kleint [Mon, 28 Jul 2014 13:16:34 +0000 (15:16 +0200)]
qwidget_win.cpp: Initialize WINDOWPLACEMENT correctly.

Task-number: QTBUG-40466
Change-Id: I93ff7977d68d36bc89f98d6a43c103a2a8d730f7
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
7 years agoFix compilation of QWinInputContext with Q_IME_DEBUG defined.
Friedemann Kleint [Fri, 25 Jul 2014 15:30:25 +0000 (17:30 +0200)]
Fix compilation of QWinInputContext with Q_IME_DEBUG defined.

Change-Id: I4f96b8ff57957e3cc370e5b1f37a036a619ce3f9
Task-number: QTBUG-40402
Reviewed-by: Liang Qi <liang.qi@digia.com>
7 years agoFix crashes in QtHelp when too many connections are made
Robert Loehning [Thu, 24 Jul 2014 14:16:08 +0000 (16:16 +0200)]
Fix crashes in QtHelp when too many connections are made

Backported from change 6481e28ba0d696cf41a2a5bc32b01db85f95b333 in qtbase

Task-number: QTBUG-36480
Change-Id: I3625d57a2f7b7b2f763a4cb92f19025b0401c593
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
7 years agoMove the C++11 support macros to a central place.
Raphael Kubo da Costa [Sun, 13 Jul 2014 20:15:00 +0000 (23:15 +0300)]
Move the C++11 support macros to a central place.

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>
7 years agogenerate QGL header file from qgl.h
Liang Qi [Fri, 18 Jul 2014 12:35:09 +0000 (14:35 +0200)]
generate QGL header file from qgl.h

Task-number: QTBUG-16838
(backported from qtbase commit 8b8eebd8a41bd91aeb5b55b702a4dbc7a8db5752)
Change-Id: I4e79404fc8203c55bdbd09c6ae9c6c7cefa915b7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agoQSslCertificate: blacklist NIC certificates from India
Peter Hartmann [Wed, 9 Jul 2014 14:22:44 +0000 (16:22 +0200)]
QSslCertificate: blacklist NIC certificates from India

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>
8 years agoMac: Fix mixing unified and non-unified toolbars
David Garcia [Wed, 5 Feb 2014 17:49:11 +0000 (18:49 +0100)]
Mac: Fix mixing unified and non-unified toolbars

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>
8 years agonetwork internals: do not try to cache a deleted entry
Peter Hartmann [Tue, 17 Jun 2014 11:26:14 +0000 (13:26 +0200)]
network internals: do not try to cache a deleted entry

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>
8 years agofix compilation errors with OS X 10.7 SDK or later for the Carbon flavor
Ashish Kulkarni [Tue, 27 May 2014 14:43:00 +0000 (20:13 +0530)]
fix compilation errors with OS X 10.7 SDK or later for the Carbon flavor

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>
8 years agoUse correct values for MAC_OS_X_VERSION_10_* defines.
Jake Petroules [Mon, 2 Jun 2014 22:12:06 +0000 (18:12 -0400)]
Use correct values for MAC_OS_X_VERSION_10_* defines.

Change-Id: I1951fd6447a3d9d20feea99408174d4993a81f5c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
8 years agoProperly escape bytearray data outside the ascii range when using a codec
Lars Knoll [Wed, 4 Jun 2014 11:52:37 +0000 (13:52 +0200)]
Properly escape bytearray data outside the ascii range when using a codec

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>
8 years agoWindows: Added Comma to list of possible numpad keys
Oliver Wolff [Thu, 5 Jun 2014 09:56:01 +0000 (11:56 +0200)]
Windows: Added Comma to list of possible numpad keys

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)

8 years agoCleanlooks style: Fix floating point exception
Alexandre Rostovtsev [Wed, 28 May 2014 04:22:55 +0000 (00:22 -0400)]
Cleanlooks style: Fix floating point exception

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>
8 years agoUpdate for OS X Yosemite.
Jake Petroules [Fri, 30 May 2014 22:08:36 +0000 (18:08 -0400)]
Update for OS X Yosemite.

(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>
8 years agoFix trailing whitespace.
Jake Petroules [Fri, 6 Jun 2014 00:03:22 +0000 (20:03 -0400)]
Fix trailing whitespace.

Change-Id: Iab22897d7c766202d214b04d422e56becb544e40
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
8 years agoQClipboard Windows debugging: fix compilation with VS2005.
Samuel Gaist [Sun, 1 Jun 2014 22:03:13 +0000 (00:03 +0200)]
QClipboard Windows debugging: fix compilation with VS2005.

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>