Fix trailing whitespace.

Change-Id: Iab22897d7c766202d214b04d422e56becb544e40
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
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>
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>
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)
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>
Use correct values for MAC_OS_X_VERSION_10_* defines.

Change-Id: I1951fd6447a3d9d20feea99408174d4993a81f5c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
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>
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>
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>
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>
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>
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>
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>
Fix compilation of QWinInputContext with Q_IME_DEBUG defined.

Change-Id: I4f96b8ff57957e3cc370e5b1f37a036a619ce3f9
Task-number: QTBUG-40402
Reviewed-by: Liang Qi <liang.qi@digia.com>
qwidget_win.cpp: Initialize WINDOWPLACEMENT correctly.

Task-number: QTBUG-40466
Change-Id: I93ff7977d68d36bc89f98d6a43c103a2a8d730f7
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>