Merge branch 'refactor'

Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro

Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310

make a toplevel compile work

Change-Id: I91f35e0f8a8c66fc60cad4470704f31f5b2812ab
Reviewed-on: http://codereview.qt-project.org/4725
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>

Disabled tests for refactor->master integration

This change disables failing tests to increase the
likelihood that 'make check' terminates with a zero
exit status. This is done to prevent the CI system
from blocking further commits once qtbase#refactor
is merged into qtbase#master.

Failing tests are marked as insignificant (by putting
'CONFIG += insignificant_test' in the .pro file).

Note: This is a temporary measure that needs to be cleaned up
once the refactor->master integration is complete.
Ideally all disabled tests need to be enabled and passing.
All changes will be marked by the string QTBUG-21402 in a comment
for easy location.

Task-number: QTBUG-21402
Change-Id: Ic4400671671f6d9b75b106a6aa4755b20e74378d
Reviewed-on: http://codereview.qt-project.org/4678
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

Fix missing/broken license headers

Change-Id: I54f3ca5979b78f9eec8115cc580c32321859acf6
Reviewed-on: http://codereview.qt-project.org/4514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Fixed unstable v8 compile failure in debug-and-release builds

In debug-and-release builds, the generated sources from the debug and
the release build would race with each other.  This could cause the
source to be truncated during compilation, resulting in build failures
referring to undefined symbols.

Change-Id: Ib9eca2551d1e6c055a29be33ba46eab92f5b1861
Reviewed-on: http://codereview.qt-project.org/4626
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

hack to allow qWaitForWindowShown to be used in test cases that use QWindow

Change-Id: Id51aaf81d898f9159e4587613f5e34c3de9a5808
Reviewed-on: http://codereview.qt-project.org/4690
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

added ascii translations to qasciikey for keyup and keydown

Change-Id: I7645392b437bdaa5e981dbf07cac70ee1653b624
Reviewed-on: http://codereview.qt-project.org/4689
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Fix QNetworkReply::errorString returning an untranslated string

The QHttpNetworkConnectionPrivate::errorDetail is supposed to return a
translated string, which is then set as the QNetworkReply error.
The current code incorrectly uses QT_TRANSLATE_NOOP,
which mark the strings for translation, but does not translate them.
The result is that even with a translator loaded those strings are
written in English.

Fixes QTBUG-18382.

Merge-request: 2671
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 434686a926a2a6e71f3cdea2508898b7800f7c81)

Change-Id: I8673cef7671d41106f50b75e78394916f3b720c9
Reviewed-on: http://codereview.qt-project.org/4691
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

find qt.conf more reliably

a qmake invoked with a relative path would not find qt.conf, because it
already changed CWD, which would confuse our copy of
QCoreApplication::applicationFilePath() (see also QTBUG-21381).
we already have the absolute path to the qmake executable in
Option::qmake_abslocation, so just use it.

(cherry picked from commit c378e16e57e8ce2255116e7fdb5436524cccb8c7)

Change-Id: Icfe4254722e0855f6755b639f4c86f15bc7323ba
Reviewed-on: http://codereview.qt-project.org/4565
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>

Implemented texture cache for GL paint engine in QtGui.

This is simpler than the existing texture cache in QtOpenGL, as it only
serves the GL paint engine. There's one per context group, to simplify
the design and to prevent performance degradations.

Change-Id: I61e3c9a444d8e246a8b38da019a56f2c0a533c0c
Reviewed-on: http://codereview.qt-project.org/4674
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>

Split CFLAGS from pkg-config properly

Add support for DEFINES and INCLUDEPATH to link_pkgconfig so moc uses
the cflags properly.

Task-number: QTBUG-19922
Merge-request: 2674
Reviewed-by: ossi
(cherry picked from commit 2a1e82452a192c88bcf0250f5976492f6dc3b65f)

Change-Id: I0cf543c26780ab9d6d39450435e2c1947fee3954
Reviewed-on: http://codereview.qt-project.org/4592
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Ensure that the proxystyle is used over the style's own functions

When calling a style function such as pixelMetric() then this should be
done via the proxy style and not on the style directly.  This is so that
the proxy style always has a chance to override the original style's
implementation and still preserve the fallback to the base style.

Task-number: QTBUG-20849
Merge-request: 2645
Reviewed-by: olivier
(cherry picked from commit 270c20490813fa943b4fbf0feb1aecb98f0b19ba)

Change-Id: Id43ec17fd1eae0136d6e1f050f23bca6d7d6d6cf
Reviewed-on: http://codereview.qt-project.org/4591
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Perl check for windows configure.

Works for Windows, *nix check is done by bash shell.

Task-number: QTBUG-5710
Merge-request: 1362
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit b3de52be29a54aa23a446c7689a48f73206a7cbc)

Change-Id: I6c0ee22e354724c08fb4070b370254223fd5a431
Reviewed-on: http://codereview.qt-project.org/4590
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded

use QFile::decodeName() instead

Merge-request: 1341
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 38b4b059e83bca2fe82a0826bdf69fd8b02b2827)

Change-Id: I8133885f7b53842d7230eeb80cf2e39a244a87d7
Reviewed-on: http://codereview.qt-project.org/4589
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

QSettings: use the common appdata dir when bootstrapping qmake on win

QSystemLibrary doesn't depend on QObject, so nothing could stop us

Merge-request: 1341
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 4aff9e52efc7c6fc6124972efb3b381f85c45e4f)

Change-Id: I5209e6424adb5aea00baf1be6f81b286abf32906
Reviewed-on: http://codereview.qt-project.org/4588
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix problem with grabWindow on Mac OS X 10.6 with Cocoa

For some reason the test did not fail locally but fails in the CI
system.  A manual check of the images from the test shows it should
have failed.  Reason for this will be investigated separately

Reviewed-by: Sergio Ahumada
(cherry picked from commit c5f46907fbc0354aacc4bc4a6f5ab97c8b656d1a)

Change-Id: I15f09649bb37dd97401926eb5e52f33748e11ec0
Reviewed-on: http://codereview.qt-project.org/4668
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

Replace explicit surrogate handlers by inline methods of QChar class

Merge-request: 1284
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 50af55095afe1ba048dde357b771485ef2188778)

Change-Id: I0b1967145ad62243afc2060a6ae4ca141a9609fd
Reviewed-on: http://codereview.qt-project.org/4587
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Removed the unnecessary dependency of the QtHelp module on the QtXml one

Merge-request: 2669
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 02f55668dada4a23ab84e4d3bda1df8a4984b3ae)

Conflicts:
mkspecs/features/help.prf
tools/assistant/lib/lib.pro

Change-Id: I9702a8d2b21388906d920d577b439158f7b961d1
Reviewed-on: http://codereview.qt-project.org/4586
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix compile issue with Mac OS X 10.5

Reviewed-by: ossi
(cherry picked from commit a3f2ac29714744fb7a34aa7789ce89cb58c09de7)

Change-Id: I9a68e5e0316a2d38d59e7f41c412d8714e9ab178
Reviewed-on: http://codereview.qt-project.org/4584
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix QPixmap::grabWindow() on Mac OS X Lion

The old approach was not the recommended one and although it worked on
Mac OS X 10.6 it did not work on 10.7.  The new approach works correctly
on 10.6 and 10.7, so the fix is applied for both versions.

Task-number: QTBUG-19824
Merge-request: 1332
Reviewed-by: sroedal
(cherry picked from commit aaf94776ce1034ec2b2402b9ca0e5cf7c7848b12)

Change-Id: I567d7e2ed2e4b3256f3110f4110ab1342087bc43
Reviewed-on: http://codereview.qt-project.org/4583
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Added missing no_include_pwd check

Merge-request: 2619
Reviewed-by: ossi
(cherry picked from commit 9db6959f8893a64146124db0cfafbcb154a9e105)

Change-Id: I096013754bd78f5fcf8afcc3ae8734abc959c107
Reviewed-on: http://codereview.qt-project.org/4582
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'

Merge-request: 1299
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 81f0c44f6a4fd4cfa41af5d5b292008185bf3981)

Conflicts:
src/qt3support/itemviews/q3listbox.cpp
src/qt3support/sql/q3datatable.cpp
src/qt3support/text/q3richtext.cpp
src/scripttools/debugging/qscriptcompletiontask.cpp
src/scripttools/debugging/qscriptdebuggercodeview.cpp

Change-Id: Ie70590e77e69fbb9b2322c48c3963fd9cbba19e6
Reviewed-on: http://codereview.qt-project.org/4581
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

directfb: Include directfbgl.h directly

directfb.h is included directly in all other files, include
directfbgl.h without the directfb/ prefix as well.

$ pkg-config --cflags directfb
-D_REENTRANT -I/home/foo/install/directfb/include/directfb

Merge-request: 2643
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 647ffa677f9bf6da50fcdb7a6948501e7e6719ce)

Change-Id: If96f378a95e7790132e89f934341977520367018
Reviewed-on: http://codereview.qt-project.org/4579
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

don't detach until the list is going to be modified

removeAt() does detach()'ing for us

Merge-request: 1285
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 52223d80ec8ba6d579c091efe0e40589a5d2bd67)

Change-Id: I78865e19f989d9079c8dee47b8cf1bdf7e5db261
Reviewed-on: http://codereview.qt-project.org/4578
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

optimize QList::removeAll()

a) don't detach until an occurrence found
b) don't memmove every time an occurrence found
c) truncate quickly )

well, numbers are better than words:
before:
RESULT : tst_QList::removeAll_primitive():
     2,617,902 CPU ticks per iteration (total: 261,790,171, iterations: 100)
RESULT : tst_QList::removeAll_movable():
     2,547,540 CPU ticks per iteration (total: 254,753,960, iterations: 100)
RESULT : tst_QList::removeAll_complex():
     16,852,099 CPU ticks per iteration (total: 1,685,209,906, iterations: 100)

after:
RESULT : tst_QList::removeAll_primitive():
     73,520 CPU ticks per iteration (total: 73,520,442, iterations: 1000)
RESULT : tst_QList::removeAll_movable():
     90,422 CPU ticks per iteration (total: 90,422,464, iterations: 1000)
RESULT : tst_QList::removeAll_complex():
     9,667,073 CPU ticks per iteration (total: 9,667,072,670, iterations: 1000)

Merge-request: 1285
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit b209fe3b1a51f64541067917e96de99f14ad65f3)

Change-Id: Ia26036ed741cefcf4b5868b7b2fc5eae8130d3dc
Reviewed-on: http://codereview.qt-project.org/4577
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Missed break of switch-case added

Merge-request: 2642
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 762a9ba066db3b31a4b3c0c2fc01d545b93348fc)

Change-Id: Iba88cf117d4e3dde4fe07bfdfb7e2af25aa25e8d
Reviewed-on: http://codereview.qt-project.org/4576
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

sync win32-g++-cross with win32-g++ (lib prefix and extension)

qmake now needs library prefix and extension to be supplied. This was
added to plain win32-g++ in dbbf06e. Now added to win32-g++-cross.

Without this, static libraries get named 'X.lib' instead of 'libX.a'.

Merge-request: 1283
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 8ce9dc02cd5031f26c7fec10484a8c47904c46f5)

Change-Id: Ic12f655bcfc8a422a98819904ec796d896de77f5
Reviewed-on: http://codereview.qt-project.org/4575
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

qsystemlibrary needs no special treatment

this was just a merge artifact

(cherry picked from commit 4ac87b7042f7b08e8b427e21d74aa8d224b186bc)

Change-Id: Ifa0638982fe48fda2e8d9aa7ee43029187330f02
Reviewed-on: http://codereview.qt-project.org/4574
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix building the OpenVG graphicssystem on Linux with static libs

Without this, building OpenVG would fail because Q_OPENVG_EXPORT wasn't
defined at all, causing it to be treated as a variable name

Merge-request: 1256
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 8680ced782c5e225b2e15c50c05493a23410b119)

Change-Id: I0da36af8cdcf411325fad25fa5c4d2ab7764c0ee
Reviewed-on: http://codereview.qt-project.org/4573
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

update gitignore

(cherry picked from commit ba564e089134980200c1c71879f2474135bee5fa)

Change-Id: Id3a83228d178cefbec21b07f7e6439e3ea92b962
Reviewed-on: http://codereview.qt-project.org/4572
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

remove -fno-stack-protector

there is no need to disable stack protector unless one uses an ancient
version of gcc.
taken from kubuntu.

(cherry picked from commit 30211e6847007bf375f60f62f5806b05cec810c3)

Change-Id: Idd74823176a63002cc0f6511adc6a981bef79df9
Reviewed-on: http://codereview.qt-project.org/4571
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix make confclean

Merge-request: 1227
Reviewed-by: ossi
(cherry-picked from commit 792b4b500ab740f89db5586791105ff13778b87f)

Change-Id: Id5ec2cfb228691c8483bf1d9e0c6a763aa649217
Reviewed-on: http://codereview.qt-project.org/4570
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Retain ABI and API compatibility when Qt is built with EGL.

Author: Felix Geyer <debfx-pkg@fobos.de>

Merge-request: 1230
Reviewed-by: ossi
(cherry picked from commit dcbd920daf92d80302633f73dd8324437005a10e)

Change-Id: I8d2dc64a2785b4940d06c9493a3ba0f96a487f9b
Reviewed-on: http://codereview.qt-project.org/4569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix -no-gui

-no-gui still tried to build the graphicssystem and inputmethod
plugins, both of which require QtGui

Merge-request: 1215
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit f0ae4f8ebdc6b7c50c163cfa29e686f3f87c8ba5)

Conflicts:
src/plugins/plugins.pro

Change-Id: I74ced5817989604f3beebf1fcc60eabaf1fd8115
Reviewed-on: http://codereview.qt-project.org/4568
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix compilation with QT_NO_*

Merge-request: 1206
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit eb61f612fea1b76fe01ee237e5bd160f66aeca3d)

Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp

Change-Id: I8ff647b1e331b0c855a8f63d16a4f3cacd8e436c
Reviewed-on: http://codereview.qt-project.org/4567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Added new QOpenGLPaintDevice test case in tst_QOpenGL.

Change-Id: Ic56e4c236f52fbd5c570bb647d5d1f4e5f9e7924
Reviewed-on: http://codereview.qt-project.org/4662
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

Fix compilation

Change-Id: I0b562f810bc12e728f59976ad8467a5ce9fd9bec
Reviewed-on: http://codereview.qt-project.org/4666
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Fixed auto-test failure in tst_QOpenGL.

QOpenGLFramebufferObject::height() was returning the width...

Change-Id: I521c2df02e00015998dc31a74481113af26e1ba6
Reviewed-on: http://codereview.qt-project.org/4663
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

Fixed race condition in xcb plugin logging (when debugging is enabled).

Change-Id: I8fa11ba26037d8f78e7c5131326d94836d0de9d4
Reviewed-on: http://codereview.qt-project.org/4647
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

Compile fix for QPA

Change-Id: I26842fc754d671051ae406d9c03982bb1db8a3a7
Reviewed-on: http://codereview.qt-project.org/4660
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

don't crash when destroying the shortcuts

as shortcutDestroyed(..) modifies the shortcuts list.
disconnect from shortcutDestroyed() first, or operate on a detach()-ed list

this was uncovered by QList::removaAll() optimization patch.

(cherry picked from commit e95de30977291a251660f72baa84b5ff244711fb)

Change-Id: Ie0b371c54458ce85f4d36430de8080a5e78d8b7f
Reviewed-on: http://codereview.qt-project.org/4585
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

don't crash when destroying codec list

this was uncovered by rittk's don't-detach patch.

(cherry picked from commit cc98710df73a590c37dca19bd3aa9fcd9bbd5a92)

Change-Id: I2225e6a94e5562459d9c5fd27ac7c8e611b674fd
Reviewed-on: http://codereview.qt-project.org/4580
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Disambiguated access to QTestLib API

Commit 2cca7e0884a45c3a022609b2cb4efd381ee8d5a1 overloads
QTestLib so that QWindow * can be passed directly to
certain functions.

This fix disambiguates access to the new API by selecting
the QWindow * versions. This assumes that the QWidget *
versions are kept mostly for backwards compatibility.

Change-Id: I075196d86d8d1d38f7192dace3c3892d315bf671
Reviewed-on: http://codereview.qt-project.org/4655
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>

Disambiguated access to QTestLib API

Commit 2cca7e0884a45c3a022609b2cb4efd381ee8d5a1 overloads
QTestLib so that QWindow * can be passed directly to
certain functions.

This fix disambiguates access to the new API by selecting
the QWindow * versions. This assumes that the QWidget *
versions are kept mostly for backwards compatibility.

Change-Id: I8755c86d5ebeb275dfa9162b0168d9179a61982d
Reviewed-on: http://codereview.qt-project.org/4640
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>

Add other.pro back to auto.pro

The other/ subdirectory should still be built via other.pro.

This was overlooked by Commit 0a208dd4135fc16d05f9fd8c417d99e3f39c39fb

Task-number: QTBUG-21327
Change-Id: Ie8ebd7dfc5b1dd56ca1b629aa011d160cb563ddd
Reviewed-on: http://codereview.qt-project.org/4526
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Moved autotests in category 'tools' into new directory structure

Task-number: QTBUG-21355

Change-Id: I315d4b1f55d42391524c0e8625952dee1b96fca3
Reviewed-on: http://codereview.qt-project.org/4449
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Fix crash in QPlatformInputContextFactory.

If ic is null we shouldn't dereference it.

Change-Id: Idf472c799f8207d893f15a55fac330ea20ec451c
Reviewed-on: http://codereview.qt-project.org/4639
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Modify mkspecs/unsupported/macx-clang/qplatformdefs.h

Now mkspecs/unsupported/macx-clang/qplatformdefs.h includes
mkspecs/common/mac/qplatformdefs.h.
This patch fixes that Qt built with clang failes to load cocoa platform
plugin without QT_QPA_PLATFORM environment variable.

Change-Id: Id48268eaf7ba24403f91497539ef0dab6f22a9dc
Reviewed-on: http://codereview.qt-project.org/4564
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>

don't build ibus plugin on windows/mac

Change-Id: I932eaea19806e3ce75803cb2849d04292885fbd5
Reviewed-on: http://codereview.qt-project.org/4631
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Made FBO blit behave properly

Change-Id: Iad9b9823bbcdf1068455f743e5fbc554939f8592
Reviewed-on: http://codereview.qt-project.org/4630
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Use the context we're given

Change-Id: I5bdcd1baf1bff86d281664c219098fe841b43fce
Reviewed-on: http://codereview.qt-project.org/4629
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Moved autotests in category 'testlib' into new directory structure

Task-number: QTBUG-21353

Change-Id: I2e2ad4b7570f80b3e6500821f769e967f0a75027
Reviewed-on: http://codereview.qt-project.org/4438
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Merge branch 'master' into refactor

Conflicts:
src/3rdparty/v8
src/gui/text/qfont_qpa.cpp
src/gui/widgets/qlinecontrol.cpp
src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
tests/auto/gui.pro
tests/auto/network.pro
tests/auto/qstring/tst_qstring.cpp

Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe

configure on Windows: Store result of V8 configuration

Otherwise V8 won't be built (there's a contains()
check in src.pro).

Change-Id: Iba65e85baae1e80800e5ca0da49fde8958dfd659
Reviewed-on: http://codereview.qt-project.org/4524
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fixed build error in tst_qopengl

QOpenGLFramebufferObject must be wrapped in a QOpenGLPaintDevice
before being passed to QPainter::begin().

Change-Id: Ic82f8f17b2ea18a3790de7e75f0dd6c9092528ed
Reviewed-on: http://codereview.qt-project.org/4541
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Clang Build Fix: Cocoa platform plugin

Fix some assignment from const values to non-const without cast.
Move #import to avoid compile error.
Fix type mismatch.

Change-Id: I93ae5cd07827b92a91093df979992616b26b14af
Reviewed-on: http://codereview.qt-project.org/4536
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>

added additional qwindow test support functions for keyboard and mouse events

Change-Id: Id5be7053c917bcefb2bb8cfab58de0933baf15d3
Reviewed-on: http://codereview.qt-project.org/4540
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Fix a few memory leaks for QFontconfigDatabase

Change-Id: I015a9287f03d6965a77461d3e894de0492547cf3
Reviewed-on: http://codereview.qt-project.org/4480
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>

Moved autotests in category 'opengl' into new directory structure

Task-number: QTBUG-21356

Change-Id: I496680aa670af3409e50e1c254ef2c557b414d33
Reviewed-on: http://codereview.qt-project.org/4452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Moved autotests in category 'other' into new directory structure

Task-number: QTBUG-21327

Change-Id: I296063b665809e0411a7546fc9b41a287317ecb7
Reviewed-on: http://codereview.qt-project.org/4326
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Moved network autotests into new directory structure

Task-number: QTBUG-21223

Change-Id: I55dbf5c42a1c5d938b9e0c9bf7d90457a6c26bbc
Reviewed-on: http://codereview.qt-project.org/4259
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

use QtGui/ based includes

Change-Id: I763bdba236aef25685d9d0fa2e02741c2f5c141e
Reviewed-on: http://codereview.qt-project.org/4507
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>

Update V8

Add a "NativeMode" to V8 script compilation.

Change-Id: I73b087c9787ca7f961c2af89f45de2b8813ce1a5
Task-number: QTBUG-20344
Reviewed-on: http://codereview.qt-project.org/4500
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

tests: use contains(QT_CONFIG,private_tests) consistently

These tests used requires(contains(QT_CONFIG,private_tests)) in their
.pro file, but did not subtract themselves from their parent project
SUBDIRS when private_tests weren't enabled.

In the best case, this wastes a little time as qmake iterates over these
projects which won't be built.  In some worse esoteric cases, this may
break compilation or packaging.

Change-Id: I189c108ee9943b15114becf9d6b04f78dbabbe31
Reviewed-on: http://codereview.qt-project.org/4389
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

Make inputcontext plugin loading a bit more generic

Add a create() method to the inputcontext factory that
takes no arguments.
Add a virtual isValid() to QPlatformInputContext to
determine whether it actually works.
Remove IBUS dependencies in the xcb code so that it
can also load other plugins.

Change-Id: I6345a845f48fd4b3cacf6d8652711b16835a235c
Reviewed-on: http://codereview.qt-project.org/4487
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Fixup a few minor errors in the previous commit

Methods need to be Q_INVOKABLE to be able to call
them with QMetaObject::invokeMethod(). Also use the
correct return type.
This makes the IBUS input context work again.

Change-Id: If7ed6dd8fb99f3363c4ecebb98f889ed9eeeff00
Reviewed-on: http://codereview.qt-project.org/4486
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Add plugin mechanism to load platform input contexts

Change-Id: I6e74fd395325445420efce4adf13e89abe8177ee
Reviewed-on: http://codereview.qt-project.org/4482
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

qmake vcxproj generator: fix XML conversion for build events

Task-number: QTBUG-20419

Change-Id: I52069e0beb2b39ec4a67e83de583efd2926c6611
Reviewed-on: http://codereview.qt-project.org/4484
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

Add an SSE4.2 even simpler version of toLatin1

Use the new PCMPESTRM instruction (Parallel CoMPare Explicit-length
STRings with result in a Mask) which is added in SSE4.2 for
facilitating string operations. The "compare ranges" mode allows us to
search for characters outside the Latin 1 range and then use the
SSE4.1 PBLENDVB instruction to replace those with question marks.

Unlike previous SSE compare instructions, the PCMPxSTRx family allows
us to operate on unsigned 16-bit values. This saves us another
parallel add.

Reviewed-By: Samuel Rødal
(cherry picked from commit 45d2d36c9dbcbce403c78838ea52acd1ab111b68)

Change-Id: I0f9d864f9d19c0f0da43ccb6918dc28295074496
Reviewed-on: http://codereview.qt-project.org/4468
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Create a function that merges the SSE common code

Reviewed-by: Samuel Rødal
(cherry picked from commit bb3bd601560132df769c32808ae0b36c56d1caab)

Change-Id: Icd7f661785a793effcd4d8cd08ffa8bb5a592cd9
Reviewed-on: http://codereview.qt-project.org/4467
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction

The new instruction is PBLENDVB, which creates a result by selecting
bytes from one of two registers, depending on whether the mask
contains a 1 (0xff) or a zero.

The SSE2 code requires three instructions (and, andnot, or).

The equivalent Neon instruction is VBSL (bit select).

Reviewed-by: Samuel Rødal
(cherry picked from commit bdad106358ae177d1345f5ff85c0e38cfeb5ca90)

Change-Id: I5b0d055a4be532f81c6f11181d710525cd6c3f25
Reviewed-on: http://codereview.qt-project.org/4466
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Make QKeySequence work on Mac.

Replace WS_MAC with OS_MAC.

Change-Id: I28a7f7cb65b61f00a3a12f3b257a553b511f85af
Reviewed-on: http://codereview.qt-project.org/4353
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>

Disambiguated access to touch event API in QTestLib

Commit 079ec157f82f79814bd70a1f8753daa37b8d5c3f overloads
the touch event API in QTestLib so that QWindow * can be
passed directly to certain functions.

This fix disambiguates access to the new API by selecting
the QWindow * versions. This assumes that the QWidget *
versions are kept mostly for backwards compatibility.

Change-Id: Ib6b33edc64d81f300d4109d59fd29f25ccd605db
Reviewed-on: http://codereview.qt-project.org/4443
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

fixed mouseMove

Change-Id: I95dd22ed3216f5ad169393f535e27b1b397c8433
Reviewed-on: http://codereview.qt-project.org/4462
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Remove internal uses of Software input panel events.

Replaced with QInputPanel method calls. Only remaining instance in
QApplication::notify().

Change-Id: I384661f81d08b4322ce538bb21dbce9c7aef2f87
Reviewed-on: http://codereview.qt-project.org/4454
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Change the QInputMethodQueryEvent to be able to query a set of properties

The event now takes a Qt::InputMethodQueries bitfield. Like this the
editor can set all properties in one go on the event instead of
having to process many query events.

Change-Id: Ifd9d7328a9fce0c21625371ec744ea2090e163be
Reviewed-on: http://codereview.qt-project.org/4448
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Use new QInputPanel update function in QTextControl

Change-Id: I20f4aa4e469b507ddb40381e922dcf23f6a469b8
Reviewed-on: http://codereview.qt-project.org/4436
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Remove QT3_SUPPORT code from QMenu classes

Change-Id: I22df8f96ddca9784d6487a59a0c780ca9641fe23
Reviewed-on: http://codereview.qt-project.org/4434
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>

Rename ImMicroFocus to ImCursorRectangle

Also set ImhMultiLine on QTextEdit

Change-Id: I04a5a1d69c2048ea94c24210e2b8374f334be1b6
Reviewed-on: http://codereview.qt-project.org/4414
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Avoid double initialize of platform font database

Since platform font database will be populated in QFontDatabase::load,
no need to do it here in QFont::initialize.

Change-Id: I1b8c9f6fc9be40e0263ed3951c794141c6297e84
Reviewed-on: http://codereview.qt-project.org/4091
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>

Improved and made public the QOpenGLPaintDevice API.

The new API is more flexible, allowing the use of QOpenGLPaintDevice
with any QOpenGLContext, and putting more responsibility on the user for
ensuring the correct FBO is current (the user knows best anyhow).

Task-number: QTBUG-21263

Change-Id: I50b954125f552baef52fbb3fe2ed907a11ad519c
Reviewed-on: http://codereview.qt-project.org/4325
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>

Added equivalent to tst_QGL::destroyFBOAfterContext() in tst_QOpenGL.

The more the merrier.

Change-Id: I401ed97600a890c38cb4d5dbe0578d6bcf68e909
Reviewed-on: http://codereview.qt-project.org/4322
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>

Fix a typo in the method name

Change-Id: Ic23877e46b0b94222ae10d5ac766825ea5184e3e
Reviewed-on: http://codereview.qt-project.org/4403
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

MicroFocus is in item coordinates

Always set the microFocus/cursorRectangle in item
coordinates.
Correctly update the itemTransform in the QInputPanel for QWidgets.

Change-Id: Ic0187f808996f31e6238d934f43bc97a70522a55
Reviewed-on: http://codereview.qt-project.org/4402
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Added QInputPanel::commit()

To be called when input context is expected to commit what it had as
preedit, and resetting its state. Earlier this was done with ::reset()
when in fact documentation somewhat disallowed doing so.

Change-Id: I10ad0620aa42fce6d01a69265af8a4f5f9f4d397
Reviewed-on: http://codereview.qt-project.org/4401
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>

The keyboard position doesn't change when the item transform changes.

Change-Id: Icc93898c854cffdffffa351a5d28e8604e53ee73
Reviewed-on: http://codereview.qt-project.org/4400
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Renamed some of the methods in the QInputPanel

Change-Id: Ida03ef170e664f79708149c11a00772ee78a984b
Reviewed-on: http://codereview.qt-project.org/4399
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Add a forward declaration for QTransform

Change-Id: I6a67a48cb700bfca7c6f6b55fe5ef30b4fdcf400
Reviewed-on: http://codereview.qt-project.org/4398
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Fix RTL layout for fonts when non-printable character has an advance

If a non-printable character has an advance, we would lay out the text
as if the character was part of the output, and then ignore the
character later when the text was rendered. To fix cases such as this,
we take the dontPrint attribute into consideration when adjusting the
advances.

Task-number: QTBUG-21347
Reviewed-by: Eskil
Reviewed-by: Lars
(cherry picked from commit 6326227674efa85c1a5320141041110d211efc75)

Change-Id: I4d01b60498f3b5f30b69530c8b49dd720d83ad0b
Reviewed-on: http://codereview.qt-project.org/4410
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>

More xlib plugin fixes

Change-Id: I8b8093cd9e66129dd7cc631dd36a2fb27c3d617e
Reviewed-on: http://codereview.qt-project.org/4408
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Fix compile error on Mac.

Change-Id: I88123bc741303ff440f628f752f39486da81e426
Reviewed-on: http://codereview.qt-project.org/4358
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>

Add missing license header.

Change-Id: Icbbb450d759b732ab28896365bb5126cf4723a62
Reviewed-on: http://codereview.qt-project.org/4308
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

added QMAKE_MOC_OPTIONS variable to qmake

Merge-request: 41
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I8d492e9fbdbeeffa9f702a3a1f2fab314586809f
Reviewed-on: http://codereview.qt-project.org/4375
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

added -b<file> option to moc to support additional include files

Merge-request: 41
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I11a532b6ffe5f1c3e08aef8bc564e93f965b9e7c
Reviewed-on: http://codereview.qt-project.org/4374
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

tests: fix QNetworkProxyFactory test

QNetworkProxy takes an hostname, not an url.

Change-Id: I7504fbc02a817d6c75ee55dc8bbdd66ec1e6cd01
Reviewed-on: http://codereview.qt-project.org/4373
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>

Change in tst_qstylesheetstyle.cpp to work around a bug in testcocoon parser.

Change-Id: I1361e4c02e0c8a0424957c531e22a7b2236f725d
Reviewed-on: http://codereview.qt.nokia.com/4360
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix missing curly brackets in tst_global.cpp.

Those are required when exception handling is disabled.

Change-Id: I9ac862758bd961f4593a66d3e28005d766959478
Reviewed-on: http://codereview.qt.nokia.com/4359
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Refactor the input framework

Results of the ongoing workshop in Oslo:
QInputPanel will be the application facing interface
for controlling the input context as well as querying
things like the position of the virtual keyboard.
QInputContext is significantly cleaned up and only there as
a compatibility API for existing code.

Change-Id: Ie8e2ee480930763f414bfaae63247b1fb6500c82
Reviewed-on: http://codereview.qt.nokia.com/4357
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Fix for wayland config.test

Wayland config.test would only be able to build if there was a valid
value for QMAKE_LIBDIR_WAYLAND because if this was empty, -L would be
used, which would lead to invalid command syntax.  So even if the
library was already in the build path, the test would fail.  The test
now checks QMAKE_LIBDIR_WAYLAND for valid directoires first before add
them to the LIBS variable.

Change-Id: Ic3a3be54a41390d6302a122a6d20f896e962ccc7
Reviewed-on: http://codereview.qt.nokia.com/4354
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>

Get rid of QColor::allowX11ColorNames().

This code is no longer in use.

Change-Id: I1e582b8a5f1fad40ef75e412162f3aa9f10ab535
Reviewed-on: http://codereview.qt.nokia.com/4352
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>