Mac: Fix rendering of non-int sized fonts.

Scrolling happens in integer steps, so it's necessary to use a
fractional correction value.

Task-number: QTCREATORBUG-7127
Change-Id: I1b027d2482b7daac83ddc8cac64d2a4449de257c
Reviewed-by: Matthias Ettrich <matthias.ettrich@nokia.com>
Activate QPixmap auto-test.

Change-Id: Ie6fe917406ef402b077f7fa55a5fb4dfbbf4fbb5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Restored native behavior when moving cursor from selection

Reverting changes from 1b031759ddfdab9703dfecac13f1ed318da3dafe except
for Mac

Task-number: QTCREATORBUG-7215
Change-Id: I8570c4bd35daf8b5820507a9399d33d00f96d41b
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Removing potential crashes from out-of-thread cleanup on Symbian

There have been some crashes seen on Symbian when its
adoptedThreadMonitor attempts to clean up objects created in other, now
dead, threads. Some of these objects simply can't be cleaned up
properly outside of their original thread, so the thread has to be
checked when they are cleaned up, and cleanup skipped in the wrong
thread.

For pthread created threads, we also have the ability to insert cleanup
code during thread shutdown. This was used in the 4.7 implementation of
QThread on Symbian, and is a better solution for pthread based adopted
threads as it gives in-thread cleanup. So the appropriate pthread code
is also used with changes to adoptedThreadMonitor so that it can run
along side the pthread cleanup code.

Change-Id: Iad8207879b1ece62e5cce85f26a616166aa22486
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
Enable building with older SHAPE extension, or -no-xshape (QTBUG-24653, QTBUG-25281)

Change-Id: Idbd6671fdd665b9368709832f99bc42d2d9a1f84
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@digia.com>
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Daniel Richard G. <skunk@iSKUNK.ORG>
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
qtdbus: Export org.freedesktop.DBus.Peer interface when introspected

The ofD.Peer interface is automatically implemented when an object is
registered on DBus, but the ofD.Introspectable.Introspect method does
not show it.

You can test it by running

$ qdbus --literal <some service> <some object> \
>    org.freedesktop.DBus.Peer.Ping

$ qdbus --literal <some service> <some object> \
>    org.freedesktop.DBus.Peer.GetMachineId

Change-Id: I7062ba0cdae486d443011ee19cf3874aabf90205
(cherry picked from commit 7767eed7d678dbd51d3857e6d8353f249ab5487a)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Fix compile issue on AIX

Since local thread storage is used we need to turn this on for the xlc
compiler with the -qtls flag.

Change-Id: Ib40ec87edada56a062b0c72b7d47b38a6d0b5b13
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit ef459193ec927f347a2c91b180994428c6ea1a97)
Ensure that Proxy-Connection: Keep-Alive is respected for HTTP 1.0

When doing a NTML authentication it would close the connection after
the second phase before replying when the reply was a HTTP 1.0 version
reply. Since the Proxy-Connection header is set to Keep-Alive in this
case we want to ensure we do not close in this siutation.

Task-number: QTBUG-26037

Change-Id: Icaaf2277efc0d05a946c52fb42b5191964e2e0fe
(cherry picked from commit bd5ef309ba831740fd8475b2f7415f30c1a18be8)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Updated WebKit to 2dea2a19feedc165596b933fe9509ddd0caf4d15

Includes version bump and backport of build fix with newer glib versions

Change-Id: I42a7c6c835b3d7ae6e79f30f308b350b67dd1e7b
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
Fix Assistant crash when closing last tab.

Disable 'Close Tab' action from 'File' menu for last tab to avoid
crash. Context menu 'close' actions in "open pages" widget, are already
disabled under same conditions.

Manually cherry-picked from Qt5:
Change I7f285f45: Fix Assistant crash when closing last tab

Task-number: QTBUG-23986

Change-Id: I0176451c80f0d25e82c7cd4fb2076c23c9d50128
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Fix infinite recursion while dragging toolbar of QMainWindow.

Prevent recursion in QMainWindowLayout::endSeparatorMove().

Task-number: QTBUG-21378

Change-Id: Ie40005a35918d4da7ef911f8c3b1d1c3b5cf4fd2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Fix possible crash when copying QImage.

Task-number: QTBUG-14766

Change-Id: I0b9ec19ea43355e04a12f2dc0244b22b575fab44
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Updated WebKit to 0b63152ae5d572c4a817a53210d8907f3dd11bd7

Fresh import from qtwebkit-2.2 branch that includes -Werror fix

The bison changes are due to a local bison upgrade.

Change-Id: I61a413a5550c748c56b39362e2a0f67c321afb4d
Task: QTBUG-23987
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
rewind macro in WinCE wrongly substituted.

qdeclarativestateoperations_p.h gets wrong macro substitution by
rewind(fp) macro when compiling for Windows CE

Task-number: QTBUG-26227
Change-Id: I228ab17ee0be0e228d0c782bfb48ad5c8b12169f
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Item.mapFromItem() crashes with Items not created by the engine.

Item.mapFromItem() and Item.mapToItem() get the script engine from
the item they are called on.  Safer to use the script value passed
to the function to determine the engine being used.

Task-number: QTBUG-26280
Change-Id: Id9d6c952cc91c7799910b29a27e24945d8ba073b
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Enable MT screen event handling on Blackberry

Consuming incoming screen events through the BPS event
dispatcher on its current incarnation has proven to be
very inefficient since it cannot put up with the screen
event throughput. This patch enables the screen event
thread also for Q_OS_BLACKBERRY platforms, in addition
to stock QNX. This behavior can still be configurated
through the project file, though.

Task-number: QTBUG-26177

akin to qt5/qtbase: 9e66ee2d59d28d61e06e5c57485f1a331b82f269

Change-Id: I307b805f125d0eb213b21b3ef4476c4df5d6a853
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8