OSX: Disable window restoration for the Mac color panel

because if it is automatically restored it's out of the application's
control, so the user's interaction will be ignored.  Change
I8ce3cd94f5ae81d7877a346743ca4e0e188baa02 did this for normal windows
by default, but the dialog helpers generate windows which aren't
affected by that.

Task-number: QTBUG-31750
Change-Id: Ida063f2d36ab038af5e85de7dfa2acf61cb6dda2
(cherry-picked from qtbase commit 69554e458669c941130c2dc03d42a59ffd00e39e)
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
OSX: Disable window restoration for the Mac font panel

because if it is automatically restored it's out of the application's
control, so the user's interaction will be ignored.  Change
I8ce3cd94f5ae81d7877a346743ca4e0e188baa02 did this for normal windows
by default, but the dialog helpers generate windows which aren't
affected by that.

Change-Id: I46ce3f85ee0c11dca778eb663c87774e322d6b6b
(cherry-picked from qtbase commit c9182bc11b77675405941a0a163603cac064d8bc)
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Fix scrollbar appearance on Win8

(Cherry-picked from qtbase/61948f84da12432b9b8b178875a86f54fef12e32)

Task-number: QTBUG-26503
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Change-Id: I1ff92e9f2825e9c0171dbbf5425bb2c997d9cf5a
BlackBerry: Fixed cover mode

When the application is minimized a "thumbnail" version of the current
screen is displayed. The windows were hidden before the navigator could
capture a screenshot, so the cover was just black. This fix avoids that.

In Qt5 "setVisible" doesnt't get called, so it's not a problem there.

Change-Id: I4b657e75afcab03b8b100ac5dd41807e2ce9ef33
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Sun CC: Fix QtNetwork compilation

Change QT_SOCKLEN_T from int to socklen_t

Change-Id: I3f93230f36c9af1a709e3ff301a63d18e1e02b4e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Fix crash in QProcess::waitForStarted() on Unix.

Invoking waitForStarted() on a QProcess before or after an unsuccessful
call to start() (e.g., with an empty command), would execute FD_SET with
an invalid file descriptor and cause the process to abort.
The bug can be reliably reproduced on OSX.

(cherry-picked from qtbase commit c8d9b17367cfdcb034d11f8a168ca4ae3993e7c3)
Task-number: QTBUG-32958
Change-Id: Id25b7781168489281645e21571361ca1a71d43e3
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Add Q_ASSERT in qAllocMore() function.

The negative range test is no longer needed in QByteArray's autotest.

Task-number: QTBUG-33038
Change-Id: I4d77e78e485b3b64a31dffd99b9fe2c14420d0a2
(partial cherry picked from qtbase commit fb8be9905d5f3216edc3fbb72b8ce1c380737eac)
(partial cherry picked from qtbase commit 0ed3cf2a1c487387bbc958317c791c9c53cf5a16)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Fix QOleDropTarget object leak

1) call Release() to nativeExtra->dropTraget in
QWidgetPrivate::unregisterOleDnd() to prevent leak

2) call RevokeDragDrop() in QWidgetPrivate::setParent_sys() when the old
window handle is to be destroyed and the current widget has already
registered an ole drop target object to prevent leak

Change-Id: I767f4e0ea3e6cb5f14d72ba88e1f8f1bc8c0dc3c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Doc: update description of qmake SUBDIRS variable

You can specify a relative path to a .pro file in any directory.

Fixed a capitalization issue and a grammar issue and changed the
visible text in a link target.

Task-number: QTBUG-14139
Change-Id: Ib476bd400c46645709950c582492edcaaba9d7ed
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/31e665c7cd9b2edb25fa695bed9c528c95ad0c64)
Remove duplicated contexts in qt_de.ts

Task-number: QTBUG-33271

Change-Id: I09fb79d2c55078445e3b91530984c46a1bd721c0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Doc: update Project Options section in qmake Manual

Explain which mkspecs have the configuration option
precompile_header set.

Task-number: QTBUG-25683

Change-Id: I9b11eafad16b65523cbb90897fe88829add58bea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/ad4bda8b754a5fb4f7c6d5c4c3b941579df83c41)
Windows: Introduce QFileDialog::DontUseCustomDirectoryIcons

Folders can have a custom icon, set by the user. Some system
folders also have one, for example c:\windows\fonts.

This option allows you to disable this behavior, you'll get the
folder directory icon.

As a side-effect, you'll get a very big performance improvement
on removable/network media: 2 seconds vs 60 seconds on a SDCard
with 10000 folders.

Unlike in Qt5, here we didn't add new methods to QFileIconProvider
do avoid introducing new symbols.

Change-Id: I0b98a180e53c9ee7d583f19b3917fcc9166cb3eb
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
(cherry picked from qtbase/46685f755b01288fd53c4483cb97a22c426a57f0)
(cherry picked from qtbase/149f3efc39bebbe8fceacf2553836f90d2e1c383)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Fix compile when QT_NO_WARNING_OUTPUT defined without QT_NO_DEBUG_STREAM

qWarning is forward declared as returning QDebug when QT_NO_DEBUG_STREAM
is not defined. This conflicts with the declaration of qWarning
returning QNoDebug when QT_NO_WARNING_OUTPUT is defined.

Avoid forward declaration of qWarning when QT_NO_WARNING_OUTPUT is not
defined to fix compilation.

This does not apply to Qt 5.

Task-number: QTBUG-33301
Change-Id: Ia4750cd63ac404700aedc36f07e5516d4163e9d2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Test layout engine fundamentals

Done with Jan Arve

Task-number: QTBUG-33104

Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
(cherry picked from qtbase/f3c019649ba99844b743a4b2ceb838aba86e7070)

Change-Id: I9bd761ea8c4de032b5a83a63ad65536697e80220
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Fix layouts with expanding items with maximum size

Layout items with a Preferred size policy would be treated as fixed
size if they were in the same layout as an Expanding item (or one with
a stretch factor).

This occurred e.g. if a layout was configured similar to this:
1. One item with ExpandFlag/stretch but with a maximumSize set,
   e.g. (100x100).
2. Another item with 'just' GrowFlag, and a maximum size bigger than
   its  size hint.

If the above layout was resized to e.g. (200x50) it would cause the
expanding item to correctly get the size (100x50), but the 'growing'
item would not stretch beyond its size hint.
Instead, it would distribute space around both items, behaving as if
the 'growing' item was fixed'.

The expected behavior is to continue to grow the 'growing' item after
the expanding item has reached its size limit.

Task-number: QTBUG-33104

Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
(cherry picked from qtbase/b855e578044e49b588b32085968c63a910b9daae)

Change-Id: I943f1effd53fc7adc19824ce0747443797a0a235
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Add missing interpolator for unsigned int.

Note that there are also some missing interpolators for char, short,
long long etc, but those are most likely less common than unsigned int.

Task-number: QTBUG-33268

Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
(cherry picked from qtbase/09da1f7d1f04f51eca4dc11add2854355fad6cd4)

Change-Id: Ieae8c5f66dab0f997522ea7e7990485ecde33e27
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Revert "QTBUG-15319: fix shortcuts with secondary Xkb layout."

The change which attempted to fix QTBUG-15319 broke keyboard
shortcuts for non latin keyboard layouts.

This patch reverts QTBUG-15319 (f45cdeda8) since it caused a
regression.

Task-number: QTBUG-32908

Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7
Reviewed-by: David Faure <david.faure@kdab.com>
Compilation fix for libjpeg release 9

In the latest libjpeg version, the "boolean" type is changed so that
true and false no longer can be used instead of TRUE and FALSE.

Also, purge some ancient code remains meant to support a now defunct
OS´s idea about the boolean type.

Task-number: QTBUG-33166
Change-Id: Iebbdf300cfdc22775954de65f985358424ed2b49
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from qtbase/fad6aa619bf6eb048821a58065433f6b598c10e4)
configure: Update contact information for commercial users

Cherry-picks most of commit ef23f6d9bd in qtbase (qt5).

Change-Id: I8d9e939e3e39d76b41b07ef00d82428950dd4324
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Add missing variables initialization before requesting png offset

Initialize all values read to sensible default in case reading them
fails.

Qt 5 fix commit 0ab3e290c4808f73d46903a5274929e3833d8d3c

Task-number: QTBUG-32674
Change-Id: I3a120b5673b67f705a4ebec4359aa52e2392492a
Reviewed-by: aavit <eirik.aavitsland@digia.com>