platform/upstream/qtbase.git
9 years agoAdded -force-eglx option to configure script.
Tomasz Olszak [Tue, 10 Nov 2015 14:42:03 +0000 (15:42 +0100)]
Added -force-eglx option to configure script.

Tizen mobile 2.2* has broken eglplatform.h header so that eglx
test does not pass. eglplatform.h does not contains
MESA_EGL_NO_X11_HEADERS ifdef.

Change-Id: I8f956051f2145a60a0f6e429230a9d731c8c2dc0
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agopackaging: hotfix - removal of -mfpu-neon
Tomasz Olszak [Tue, 10 Nov 2015 14:42:02 +0000 (15:42 +0100)]
packaging: hotfix - removal of -mfpu-neon

painting/qdrawhelper.cpp didn't compile without this.

Change-Id: I71606cd420c9596ebd534a789d2cf4e5c0ee7e56
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agopackaging: Added winphone msvc2013 mkspecs
Tomasz Olszak [Tue, 10 Nov 2015 14:42:02 +0000 (15:42 +0100)]
packaging: Added winphone msvc2013 mkspecs

Bug-Tizen: TIVI-2416

Change-Id: Icad7d85744f9d97395d1eaf4a788a00c84253802
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoBump package version to 5.3.0
Tomasz Olszak [Tue, 10 Nov 2015 14:42:02 +0000 (15:42 +0100)]
Bump package version to 5.3.0

Change-Id: I466d153984ec4458320d27872890b6672af56dd5
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoSet TIZEN_EMULATOR for Tizen 2.2 mobile emulator
Tomasz Olszak [Tue, 10 Nov 2015 14:42:02 +0000 (15:42 +0100)]
Set TIZEN_EMULATOR for Tizen 2.2 mobile emulator

Change-Id: Ia9d9ba64b08d3740a402bf7ce7582427f567c28a
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agopackaging: qt5-qtwayland: break the cycle dep
Tomasz Olszak [Tue, 10 Nov 2015 14:42:01 +0000 (15:42 +0100)]
packaging: qt5-qtwayland: break the cycle dep

Change-Id: I5934f4edf9ccdbd6a52fa89598c3a9ef47fbb0ad
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
9 years agopackaging: qtgui requires qtwayland
Tomasz Olszak [Tue, 10 Nov 2015 14:42:01 +0000 (15:42 +0100)]
packaging: qtgui requires qtwayland

Change-Id: I3f13d82a07b75823861d3b711495874998957060
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
9 years agoBump package version to 5.2.96+rc2
Tomasz Olszak [Tue, 10 Nov 2015 14:42:01 +0000 (15:42 +0100)]
Bump package version to 5.2.96+rc2

Change-Id: Iab423b462db6247ac611d10ec95344b56dcfead3
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoAdded back xkeyboard-config in ivi
Tomasz Olszak [Tue, 10 Nov 2015 14:42:00 +0000 (15:42 +0100)]
Added back xkeyboard-config in ivi

It is again available in ivi repository.

Bug-Tizen:TIVI-2416

Change-Id: I780f62c23ced5326af14ab7674813c9ffab7d48c
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agopackaging: Remove xkeyboard-config in ivi
Tomasz Olszak [Tue, 10 Nov 2015 14:42:00 +0000 (15:42 +0100)]
packaging: Remove xkeyboard-config in ivi

Bug-Tizen:TIVI-2416

Change-Id: Ifccd00c9dc479c58f91831f06be348988c086dab
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agopackaging: Use qt's xkbcommon (0.4.*) version.
Tomasz Olszak [Tue, 10 Nov 2015 14:42:00 +0000 (15:42 +0100)]
packaging: Use qt's xkbcommon (0.4.*) version.

Bug-Tizen:TIVI-2416

Change-Id: I557faf695fc6c91ed86bbe641456a6785b06bcb1
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoBump package version to 5.2.95+rc1
Tomasz Olszak [Tue, 10 Nov 2015 14:42:00 +0000 (15:42 +0100)]
Bump package version to 5.2.95+rc1

Change-Id: I5f99995d7413779e16966d0fa1cda050d64337d2
Bug-Tizen:TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoAdded manifest file according to smack 3-domain model.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:59 +0000 (15:41 +0100)]
Added manifest file according to smack 3-domain model.

Bug-Tizen:TIVI-2416

Change-Id: If84175960d7df18ba95a964a5a665c86ea84b4f8
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agopackaging: spec file adapted for Tizen 2.2.1
Tomasz Olszak [Tue, 10 Nov 2015 14:41:59 +0000 (15:41 +0100)]
packaging: spec file adapted for Tizen 2.2.1

Bug-Tizen:TIVI-2416

Change-Id: I30622e9367cffd3b292b6aff9d89d2eeb041fd7e
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoBump package version to 5.2.90+alpha
Tomasz Olszak [Tue, 10 Nov 2015 14:41:59 +0000 (15:41 +0100)]
Bump package version to 5.2.90+alpha

Bug-Tizen:TIVI-2416

Change-Id: I8577b2a583d55e73809fd2c6e0ab29809cf25be6
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoBump package version to 5.2.2
Tomasz Olszak [Tue, 10 Nov 2015 14:41:58 +0000 (15:41 +0100)]
Bump package version to 5.2.2

Bug-Tizen:TIVI-2416

Change-Id: I2d25950fe9b78e090f0bee771118f5af16c143d8
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoFixes build on mobile:arm/atom ivi and generic
Tomasz Olszak [Tue, 10 Nov 2015 14:41:58 +0000 (15:41 +0100)]
Fixes build on mobile:arm/atom ivi and generic

The issue was with pkgconfig(egl) and (glesv2). The pkgconfig(gles20)
will be substituted to correct packages in each profile.

Bug-Tizen:TIVI-2416

Change-Id: I6680f309392f2d750a2bd9949edb4200ab8b09ac
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoProper handling of x,wayland bcond's.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:58 +0000 (15:41 +0100)]
Proper handling of x,wayland bcond's.

Now generic should build just fine.

Bug-Tizen:TIVI-2416

Change-Id: Ic99512e66b122f1f3784abe6025014d90a1918b4
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoRefactored spec file.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:58 +0000 (15:41 +0100)]
Refactored spec file.

Removed qt5-qtbase empty package and changed
qt5-plugins-platform-inputcontext-compose to
qt5-plugins-platforminputcontext-compose

Change-Id: I940c7966117ae5f5ba559db094ff171662543ce2
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoBump package version to 5.2.1
Tomasz Olszak [Tue, 10 Nov 2015 14:41:57 +0000 (15:41 +0100)]
Bump package version to 5.2.1

Change-Id: Iddf93c72b2e1688bc2fe896d6998c046e513c49e

9 years agoGL instead of EGL Used in Mobile.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:57 +0000 (15:41 +0100)]
GL instead of EGL Used in Mobile.

Change-Id: Ie791552b5fb93b2cdd206742aead1c04bbd3bdf0

9 years agospec files adapted for Tizen
Tomasz Olszak [Tue, 10 Nov 2015 14:41:57 +0000 (15:41 +0100)]
spec files adapted for Tizen

Change-Id: Ie2283bf2520b5a2f10d472c88b3acf71621a1936

9 years agoImport from Mer
Tomasz Olszak [Tue, 10 Nov 2015 14:41:56 +0000 (15:41 +0100)]
Import from Mer

Change-Id: I0873b0e393e4c982b8f81579cf8cccb64ea94211

9 years agoAdded device mkspec for Tizen 2.* mobile cross compilation.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:56 +0000 (15:41 +0100)]
Added device mkspec for Tizen 2.* mobile cross compilation.

Change-Id: I01c42562141906ca7a1f873d9818965434418860
Reviewed-by: Jarosław Staniek <staniek@kde.org>
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoAdded tizen mkspecs for OBS builds (non cross-compiled)
Tomasz Olszak [Tue, 10 Nov 2015 14:41:56 +0000 (15:41 +0100)]
Added tizen mkspecs for OBS builds (non cross-compiled)

Change-Id: I8d0da57c53fef71313ab2f8bd5e53ee5a0ff7f84
Reviewed-by: Jarosław Staniek <staniek@kde.org>
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoRemoved unused Tizen device mkspecs.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:55 +0000 (15:41 +0100)]
Removed unused Tizen device mkspecs.

Change-Id: I6c89687829d929d5166c2c7ccaffb998b2bbc0c2
Reviewed-by: Jarosław Staniek <staniek@kde.org>
9 years agoxcb: Added Tizen 2.3 adaptation
Tomasz Olszak [Tue, 10 Nov 2015 14:41:55 +0000 (15:41 +0100)]
xcb: Added Tizen 2.3 adaptation

Adaptation includes:
* Application lifecycle depending on X atoms. Tizen 2.3
native application lifecycle depends on X window. So we react on
_X_ILLUME_ACTIVATE|DEACTIVATE_WINDOW atoms and suspend or activate application
accordingly.
* Platform native interface function for setting device orientation. This api
is defined in QtPlatformHeaders/qxcbfunctions.h and can be used from Tizen
application wrapper code.

Change-Id: I0105717dcb4f652dd27e891a5f6c21388d8399ca
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoxcb: Added handling of XCB_STATIC_LINK qmake variable.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:55 +0000 (15:41 +0100)]
xcb: Added handling of XCB_STATIC_LINK qmake variable.

This makes it possible to link xcb platform plugin statically with
libxcb. Such plugin will be bundled in Tizen application package because
Tizen compliance policy does not allow to link to system libxcb (it
supposed to be replaced by wayland in the future).

Change-Id: Iaf66cf2b4a04a32e1fd653bcb9eb7c0d915a3981
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoAdded handling of Tizen 2.3 Mobile cross-compilation and deployment.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:54 +0000 (15:41 +0100)]
Added handling of Tizen 2.3 Mobile cross-compilation and deployment.

Mkspec and configure refactored similar to Android.

Change-Id: I311af56ca9060d933905b876975e83113c685270
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
9 years agoconfigure: added env variable handling to extractQMakeVariables
Tomasz Olszak [Tue, 10 Nov 2015 14:41:54 +0000 (15:41 +0100)]
configure: added env variable handling to extractQMakeVariables

Thise makes it possible to extract qmake variables that reference
environment variables, e.g.:

  SOME_QMAKE_VARIABLE = $$(SOME_ENV_VARIABLE)

Change-Id: I5b80a9959bc9041413c7549913c4f939a8fda807
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
9 years agoRevert "Added tizenscim input context plugin."
Tomasz Olszak [Tue, 10 Nov 2015 14:41:54 +0000 (15:41 +0100)]
Revert "Added tizenscim input context plugin."

This reverts commit 768597743f265f280208ae596d89f8a0cfc65db6.

Change-Id: I04b112c8fcd3147928360fc5cf512dfc921a9070

9 years agoRevert "Tizen: Refactored mkspecs. One platform for all profiles."
Tomasz Olszak [Tue, 10 Nov 2015 14:41:54 +0000 (15:41 +0100)]
Revert "Tizen: Refactored mkspecs. One platform for all profiles."

This reverts commit 059d84cc073f706d8207c42eb30dd30f0af2a1ea.

Change-Id: I62ef21b8920c4e4ba82c9ebf23bfd61eedfcc6b2

9 years agoRevert "Tizen: always try to build ibus and compose."
Tomasz Olszak [Tue, 10 Nov 2015 14:41:53 +0000 (15:41 +0100)]
Revert "Tizen: always try to build ibus and compose."

This reverts commit 78a77290d53b8eb5a26d24a0f4f8f838b734b6f1.

Change-Id: Ifab717e7e88cb24f83bd9bfd85987c243547d220

9 years agoRevert "Tizen - handling application lifecycle"
Tomasz Olszak [Tue, 10 Nov 2015 14:41:53 +0000 (15:41 +0100)]
Revert "Tizen - handling application lifecycle"

This reverts commit 8c1b114b38275ae0620f61b9f62803cfd90fc35b.

Change-Id: I4231b278e262d223d85c372521c22949e4112cb4

9 years agoRevert "Tizen: Added screen orientation handling in xcb plugin."
Tomasz Olszak [Tue, 10 Nov 2015 14:41:53 +0000 (15:41 +0100)]
Revert "Tizen: Added screen orientation handling in xcb plugin."

This reverts commit e87d1daea3425ed1c2898a3a343853cc17af2243.

Change-Id: Ibfbbc1183accfb68e509d29643a8136215383846

9 years agoRevert "tizenscim: added handling virtual keyboard geometry changes."
Tomasz Olszak [Tue, 10 Nov 2015 14:41:52 +0000 (15:41 +0100)]
Revert "tizenscim: added handling virtual keyboard geometry changes."

This reverts commit 7183f1a92b531545c1979ba4ee65b3ae24ea63a6.

Change-Id: I098175f05c7985d8db2dfefc23f7af9e38d910ba

9 years agoRevert "Fix: Added tizenscim input context plugin."
Tomasz Olszak [Tue, 10 Nov 2015 14:41:52 +0000 (15:41 +0100)]
Revert "Fix: Added tizenscim input context plugin."

This reverts commit 1e8a0819ecc5e58f35013addcef4e069b9198ee0.

Change-Id: I45da253aef1073a40cf6326a78ab6cd68c314820

9 years agoRevert "Fix for Added screen orientation handling in xcb plugin."
Tomasz Olszak [Tue, 10 Nov 2015 14:41:52 +0000 (15:41 +0100)]
Revert "Fix for Added screen orientation handling in xcb plugin."

This reverts commit b222ce60c623c44cddc1a7c39a247790c9af1bb1.

Change-Id: I898163eaaf9d34be35731d73ef6a86f7908cf0cb

9 years agoFix for Added screen orientation handling in xcb plugin.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:51 +0000 (15:41 +0100)]
Fix for Added screen orientation handling in xcb plugin.

Change-Id: I458f3974b3b1b11e9078f4881cfd03f3158707d7
Reviewed-by: Philippe Coval <rzr@gna.org>
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoFix: Added tizenscim input context plugin.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:51 +0000 (15:41 +0100)]
Fix: Added tizenscim input context plugin.

tizenscim can't be determined by Q_OS_LINUX_TIZEN_MOBILE macro because on Tizen 3.0 Mobile tizenscim is not available.

Change-Id: Ia490fccfde0f3c8f182b1476cf71a878a9bca3c6
Reviewed-by: Jarosław Staniek <staniek@kde.org>
9 years agoAdded common and wearable defines
Tomasz Olszak [Tue, 10 Nov 2015 14:41:51 +0000 (15:41 +0100)]
Added common and wearable defines

Change-Id: I9abd1bb6e0453f6984bb042d38da0b79593d7121
Reviewed-by: Jarosław Staniek <staniek@kde.org>
9 years agoTizen: always try to build ibus and compose.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:51 +0000 (15:41 +0100)]
Tizen: always try to build ibus and compose.

Add tizenscim only for mobile profile.

Change-Id: Ie532faf012d4644ed10eaf4bb2efaa06ecba3dc0
Reviewed-by: Jarosław Staniek <staniek@kde.org>
9 years agoTizen: Refactored mkspecs. One platform for all profiles.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:50 +0000 (15:41 +0100)]
Tizen: Refactored mkspecs. One platform for all profiles.

Change-Id: I81527298ec771b6bb3215ab4eb3f577a5629608c
Reviewed-by: Jarosław Staniek <staniek@kde.org>
Reviewed-by: Leon Anavi <leon@anavi.org>
9 years agoAdded commmon linux-g++-tizen spec.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:50 +0000 (15:41 +0100)]
Added commmon linux-g++-tizen spec.

Change-Id: I2b3f88a26f9000d908719aaabf29195de088c508
Reviewed-by: Jarosław Staniek <staniek@kde.org>
9 years agotizenscim: added handling virtual keyboard geometry changes.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:50 +0000 (15:41 +0100)]
tizenscim: added handling virtual keyboard geometry changes.

Change-Id: I11c31eab3577c70b613687dc33ce86946fa24915
Reviewed-by: Jarosław Staniek <staniek@kde.org>
Reviewed-by: Leon Anavi <leon@anavi.org>
9 years agoAdded tizenscim input context plugin.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:49 +0000 (15:41 +0100)]
Added tizenscim input context plugin.

Now it's the only input context plugin available on mobile
and emulator.

Change-Id: I621a58e752d3851226891a9a7eb8d7e89b3cd5fb
Reviewed-by: Jarosław Staniek <staniek@kde.org>
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoTizen: Added screen orientation handling in xcb plugin.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:49 +0000 (15:41 +0100)]
Tizen: Added screen orientation handling in xcb plugin.

X Window events sent by Window Manager are used.

Change-Id: I06970059a003326ddda94cf07d8822f14af5cadc
Reviewed-by: Jarosław Staniek <staniek@kde.org>
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoHW Back button: Fixed after merge with 5.2 stable.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:49 +0000 (15:41 +0100)]
HW Back button: Fixed after merge with 5.2 stable.

Change-Id: I3253b116747124d67ccd63396a3fe710d0d1d96d
Reviewed-by: Jarosław Staniek <staniek@kde.org>
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoSetting DFLT_XKB_CONFIG_ROOT only if not defined.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:49 +0000 (15:41 +0100)]
Setting DFLT_XKB_CONFIG_ROOT only if not defined.

Now it is possible to set DFLT_XKB_CONFIG_ROOT from
devices mkspecs.

Change-Id: Ica503625e9b8126b16aaf7f80e7ec2833ea33763
Reviewed-by: Jarosław Staniek <staniek@kde.org>
Conflicts:
src/3rdparty/xkbcommon.pri

9 years agoAdded tizen_app.prf for building Tizen tpk's.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:48 +0000 (15:41 +0100)]
Added tizen_app.prf for building Tizen tpk's.

Change-Id: I9a8de239d38dac4e03f73911e636aa267aeb3dae
Reviewed-by: Jarosław Staniek <staniek@kde.org>
9 years agoTizen: Fix QCoreApplication::applicationDirPath()
Tomasz Olszak [Tue, 10 Nov 2015 14:41:48 +0000 (15:41 +0100)]
Tizen: Fix QCoreApplication::applicationDirPath()

Disable the code path which queries /proc/<pid>/exe for the
current executable path, as from a Q_OS_LINUX_TIZEN perspective,
this executable will be the launch_app binary. Instead we
get the application directory via the fallback, by
looking in argv[0], since this is set to the location of the
application binary.

Change-Id: I3132266b8fa83cfad968e5d04883d88a731c1a87
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoAdded Tizen hardware button handling.
Tomasz Olszak [Tue, 10 Nov 2015 14:41:48 +0000 (15:41 +0100)]
Added Tizen hardware button handling.

It is mainly the same as in the Android so Android solution
 was adapted.

Change-Id: Ie86c5fdd6e25178054e4df77ec4fe318960461ba
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoTizen - handling application lifecycle
Tomasz Olszak [Tue, 10 Nov 2015 14:41:47 +0000 (15:41 +0100)]
Tizen - handling application lifecycle

Change-Id: I47763f2d42e400df3e0e60515468ada8c8546128
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoAdded mkspec for Tizen emulator, mobile and ivi
Tomasz Olszak [Tue, 10 Nov 2015 14:41:47 +0000 (15:41 +0100)]
Added mkspec for Tizen emulator, mobile and ivi

Change-Id: I2bd5471f573b89125d54f371d919e74534fec06b
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
9 years agoPrefer GStreamer 1.0 on Linux. upstream v5.5.90+alpha1
Yoann Lopes [Tue, 25 Aug 2015 15:28:13 +0000 (17:28 +0200)]
Prefer GStreamer 1.0 on Linux.

As planned for 5.6, QtMultimedia now uses GStreamer 1.0 over
0.10 when available.
This means the binary packages will be based on GStreamer 1.0.

Task-number: QTBUG-47920
Change-Id: I9a18569ff96902116f0f6a759c185a5896f520d5
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
9 years agoPort examples/opengl to new connection syntax.
Friedemann Kleint [Fri, 28 Aug 2015 13:16:57 +0000 (15:16 +0200)]
Port examples/opengl to new connection syntax.

Change-Id: I486a4a2326bf57ec5ea08bccdcef79c3e5553db5
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
9 years agoWinRT: Fixed possible integer overflow in timer registration code
Oliver Wolff [Tue, 1 Sep 2015 06:49:31 +0000 (08:49 +0200)]
WinRT: Fixed possible integer overflow in timer registration code

Task-number: QTBUG-48012
Change-Id: If1b80e59c13230bc0a62c6fa3d45b6e2272b9e28
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
9 years agoQUuid: Also use CoCreateGuid on WinRt/Winphone and WinCE
Oliver Wolff [Mon, 17 Aug 2015 07:33:28 +0000 (09:33 +0200)]
QUuid: Also use CoCreateGuid on WinRt/Winphone and WinCE

Change-Id: Ie44bd50fa1f2d4224f65d08fb4d721c3651b49ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
9 years agoMove min left/right bearing calculations to QFontEngine baseclass
Tor Arne Vestbø [Mon, 17 Aug 2015 15:59:06 +0000 (17:59 +0200)]
Move min left/right bearing calculations to QFontEngine baseclass

The logic used in the FreeType font engine can be generalized
and move to the QFontEngine baseclass. This allows the CoreText
font engine to correctly report the minimum left/right bearings,
which decreases the chance that an optimization in QTextLayout's
line breaking algorithm will produce wrong results.

The calculation of left and right bearing has been moved to the
glyph_metrics_t type to reduce code duplication. This allows us
to use the with and height of the bounding box to determine if
the glyph has any contours.

Change-Id: I864697d3f31ed56f22f04666199b6c5023c5e585
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
9 years agoCocoa: Clean up context creation.
Morten Johan Sørvig [Thu, 20 Aug 2015 13:37:04 +0000 (15:37 +0200)]
Cocoa: Clean up context creation.

Make the fallback to creating an unshared context
actually work by using correct [initWithFormat: ]
code.

Warn and return early on context creation failure
instead of continuing and crashing.

Change-Id: Ic88f419eaa717436aefc9c1da36c47e0ccb3e956
Task-number: QTBUG-47825
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
9 years agoQAbstractSocket: Always set errorString right after socketError
Kai Koehne [Fri, 10 Jul 2015 13:03:43 +0000 (15:03 +0200)]
QAbstractSocket: Always set errorString right after socketError

Otherwise errorString() might not match error() in a
statusChanged handler.

Change-Id: If1250b4552412eabe88457dee031e4ef3f533838
Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoWindows: Improve debug output of mime conversion handling.
Friedemann Kleint [Wed, 19 Aug 2015 10:29:41 +0000 (12:29 +0200)]
Windows: Improve debug output of mime conversion handling.

Introduce convenience function for obtaining the format
name and use that.
Add debug operator for struct FORMATETC including format name.
Replace all code enclosed in #ifdef QMIME_DEBUG by qCDebug().

Task-number: QTBUG-47656
Change-Id: Ibb3c860c57edee4a31e8f5f37e3245feebed52a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
9 years agoPolish the screen shot example.
Friedemann Kleint [Fri, 28 Aug 2015 08:56:58 +0000 (10:56 +0200)]
Polish the screen shot example.

- Remove unneeded member variables.
- Set window sizes depending on screen geometry for High DPI screens.
- Flesh out code for saving the image, setting the supported
  mime types on the file dialog.
- Streamline constructor code, remove create...() functions.
- Use new connection syntax in createActions(),
- Obtain the screen from the widget.
- Adapt documentation. Remove note saying that widgets do not need
  the parent parameter (since creating parentless widgets can
  result in flicker in some cases), explain that QScreen pointers
  should be checked.

Change-Id: I0332bbf10eafe861fe3fd5573522694ab5c0183a
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
9 years agoPolish the systray example.
Friedemann Kleint [Fri, 28 Aug 2015 07:29:45 +0000 (09:29 +0200)]
Polish the systray example.

- Port it to new connection syntax.
- Replace module include by class includes.

Change-Id: I1b8d682bb7bb2e05b6b2b77a9c0d01730ea09cf2
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
9 years agoPolish rich text example.
Friedemann Kleint [Tue, 25 Aug 2015 12:19:37 +0000 (14:19 +0200)]
Polish rich text example.

- Introduce Qt 5 signals & slot syntax.
- Use mime types in the file dialogs.
- Streamline the code creating the actions.
- Introduce QCommandLineParser.
- Query the available size when determining
  the initial size instead of using hard-coded values
  for High-DPI screens.

Change-Id: Ifc84a41ed55a4a674b6eafdb6120ac42441405b6
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
9 years agowinrt: Enable window visibility for the root window.
Samuel Nevala [Thu, 27 Aug 2015 06:17:05 +0000 (09:17 +0300)]
winrt: Enable window visibility for the root window.

- Minimized and Hidden: hide the status bar and collapse winrt native ui element.
- Windowed and Maximized: show the status bar and re-size the window.
- FullScreen and AutomaticVisibility: hide the status bar and re-size the window.

Showing & hiding the status bar and re-sizing the window affect only the
windows phone build.

Change-Id: Iaa412382bffc14e470720f2213bb3f6851f57a6b
Task-Id: QTBUG-47811
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
9 years agoDeclare StandardButton & ButtonRole types for cross-thread use.
Samuel Nevala [Wed, 26 Aug 2015 12:30:36 +0000 (15:30 +0300)]
Declare StandardButton & ButtonRole types for cross-thread use.

On windows phone native dialog interaction is handled from
XMAL thread. Declare and register dialog helpers StandardButton
and ButtonRole for cross-thread usage.

Change-Id: Ic1842a5af8a1122fdffb766b4f723d272bdbcac2
Task-Id: QTBUG-47941
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
9 years agowinrt: Work around broken screen rotation on Windows Phone 8.1.
Samuel Nevala [Wed, 26 Aug 2015 07:26:31 +0000 (10:26 +0300)]
winrt: Work around broken screen rotation on Windows Phone 8.1.

Expose on orientation change clears bad frames caused by race between
Qt and ANGLE.

Change-Id: I8970c6be36133d861c718a946d9e9b7a5e88cc2c
Task-Id: QTBUG-44333
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
9 years agoCompile in namespaced builds
Sean Harmer [Tue, 18 Aug 2015 11:06:26 +0000 (04:06 -0700)]
Compile in namespaced builds

Change-Id: I2894fbadec50286c0831bf381d149b54ade9182d
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
9 years agoDocument handleWindowSystemEvent()
Morten Johan Sørvig [Mon, 27 Apr 2015 20:32:57 +0000 (22:32 +0200)]
Document handleWindowSystemEvent()

Document asynchronous and synchronous mode behavior.

Change-Id: I2dc1256af5b3a8014025c89c65d41480f18f0701
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
9 years agoImplement threaded synchronous WS events
Morten Johan Sørvig [Wed, 29 Apr 2015 11:17:31 +0000 (13:17 +0200)]
Implement threaded synchronous WS events

Make handleWindowSystemEvent() support being called
from secondary threads in synchronousWindowSystemEvent
mode.

This is implemented by posting the event to the Gui
event queue (which will wake the Qt Gui thread), and
then calling flushWindowSystemEvents which will block
the calling thread until the event has been processed.

Change-Id: I7e8e68c1e0290c17105563268e316b0f8205b3ce
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
9 years agoMake flushWindowSystemEvents return ev. accepted
Morten Johan Sørvig [Wed, 29 Apr 2015 10:34:16 +0000 (12:34 +0200)]
Make flushWindowSystemEvents return ev. accepted

flushWindowSystemEvents() now returns whether the
most recent event added to the queue was accepted
by Qt or not.

Use QAtomicInt to store the accepted state in order
to avoid a data race on it between the Gui thread
and the event poster thread.

Change-Id: I6c111fdaecda5c514307ca0749a54075fe8e872f
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
9 years agoMerge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Simon Hausmann [Thu, 27 Aug 2015 20:20:34 +0000 (20:20 +0000)]
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6

9 years agoOptimize set color component in RGBA64
Allan Sandfeld Jensen [Wed, 19 Aug 2015 13:01:19 +0000 (15:01 +0200)]
Optimize set color component in RGBA64

After the removal of direct access through type punning,
the direct color setters can be better optimized.

Change-Id: Icaa5b1f8c8fe90863dd42fa4dfb5a2998c273465
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoFix some qdoc-warnings.
Friedemann Kleint [Wed, 26 Aug 2015 10:02:40 +0000 (12:02 +0200)]
Fix some qdoc-warnings.

qtbase/src/widgets/kernel/qaction.cpp:1257: warning: Can't link to 'QApplication::setAttribute()'
qtbase/src/widgets/kernel/qapplication.cpp:519: warning: Can't link to 'arguments()'
qtbase/src/widgets/kernel/qapplication.cpp:1939: warning: Can't link to 'quit()'
qtbase/src/widgets/kernel/qapplication.cpp:2946: warning: Can't link to 'quit()'
qtbase/src/widgets/kernel/qapplication.cpp:2946: warning: Can't link to 'exit()'
qtbase/src/widgets/kernel/qapplication.cpp:2946: warning: Can't link to 'processEvents()'
qtbase/src/widgets/widgets/qmenu.cpp:1354: warning: Can't link to 'Recent Files Example'
qtbase/examples/widgets/doc/src/tetrix.qdoc:28: warning: Can't link to 'QApplication::quit()'
qtbase/src/testlib/qtestcase.cpp:268: warning: Undocumented parameter 'timeout' in QTRY_VERIFY2_WITH_TIMEOUT()
qtbase/src/corelib/global/qnamespace.qdoc:2427: warning: Can't link to 'QApplication::setLayoutDirection()'
qtbase/src/corelib/global/qnamespace.qdoc:751: warning: Can't link to 'QApplication::setDesktopSettingsAware()'

Change-Id: Ic8170a40fb1cd84e3fb4dd75d9429f4b485f8bd9
Reviewed-by: Martin Smith <martin.smith@digia.com>
9 years agoQPlatformFileDialogHelper::cleanFilterList(): Allow for ',' in glob.
Friedemann Kleint [Wed, 26 Aug 2015 13:09:50 +0000 (15:09 +0200)]
QPlatformFileDialogHelper::cleanFilterList(): Allow for ',' in glob.

RCS files (text/plain) have the glob pattern "*,v", which caused
the regular expression match to fail.

Task-number: QTBUG-47923
Change-Id: I7d8682ef51306cb4da58a2b3880842bd99892ea3
Reviewed-by: David Faure <david.faure@kdab.com>
9 years agowinrt: Fix MessageDialog show on windows phone.
Samuel Nevala [Wed, 26 Aug 2015 12:11:39 +0000 (15:11 +0300)]
winrt: Fix MessageDialog show on windows phone.

Run native dialog show on XAML thread.

Change-Id: I6273340e87d70aae21c838d9d7646a233c1f48be
Task-Id: QTBUG-47938
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
9 years agowinrt: Add missing Q_DECL_OVERRIDE and fix white space.
Samuel Nevala [Thu, 27 Aug 2015 06:16:09 +0000 (09:16 +0300)]
winrt: Add missing Q_DECL_OVERRIDE and fix white space.

Change-Id: Ibbcb637dac4d531934786fff25f7b8c36ef5ebed
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
9 years agoMerge remote-tracking branch 'origin/5.5' into 5.6
Liang Qi [Wed, 26 Aug 2015 18:06:57 +0000 (20:06 +0200)]
Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
qmake/doc/snippets/code/doc_src_qmake-manual.pro
qmake/doc/src/qmake-manual.qdoc
src/corelib/io/qstorageinfo_unix.cpp
src/corelib/tools/qbytearray.cpp
src/widgets/kernel/qwidgetwindow.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
tests/auto/network/access/qnetworkreply/BLACKLIST

Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c

9 years agoAdding plasma5 support for QKdeTheme
Stanislav Baiduzhyi [Fri, 21 Aug 2015 12:14:38 +0000 (14:14 +0200)]
Adding plasma5 support for QKdeTheme

Plasma 5 uses the same config files structure, but follows XDG spec
instead of storing them in custom locations.
Added '5' to supported KDE session version, and passing it to other
methods because 'kdeglobals' is located directly under XDG config
dirs and not deeper inside.

[ChangeLog][QtPlatformSupport][QKdeTheme] adding plasma5 support

Change-Id: I5f1d8d8f8d02449328db3ffc391ad23506cd67c7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: David Faure <david.faure@kdab.com>
9 years agoqdoc: allow 'void' function parameter without a parameter name
Topi Reinio [Tue, 25 Aug 2015 10:59:25 +0000 (12:59 +0200)]
qdoc: allow 'void' function parameter without a parameter name

There are a few functions using a C-style function declaration:

    void foo(void);

meaning that foo() takes no parameters. This change allows this
for QDoc, making it successfully match documented \fn blocks
with the correct declaration, and not print out warnings.

Change-Id: I8191c55094371431b0e9c2ad22d19cadcb7facfb
Reviewed-by: Martin Smith <martin.smith@digia.com>
9 years agoqdoc: Use lowercase names for modules read from index files
Topi Reinio [Tue, 25 Aug 2015 10:34:12 +0000 (12:34 +0200)]
qdoc: Use lowercase names for modules read from index files

The module names are used as keys in the map that defines the
forest of module trees. A physical module name (lowercase) is
used as the primary tree name, but modules read from index
were using a name written to the index file (project name,
typically CamelCase) as-is.

This caused issues for resolving link commands that have a
module name in the square bracket parameters. To ensure that
such links work, convert module names read from index to
lowercase, too.

Change-Id: I698e01fd1df888e4a78c06a76ad72b5eb1a70892
Reviewed-by: Martin Smith <martin.smith@digia.com>
9 years agoDoc: Fix QDoc warnings for QOpenGLFunctions and QOpenGLExtraFunctions
Topi Reinio [Mon, 24 Aug 2015 11:43:13 +0000 (13:43 +0200)]
Doc: Fix QDoc warnings for QOpenGLFunctions and QOpenGLExtraFunctions

    - Use \a commands when listing the arguments for OpenGL methods
    - Document functions taking a single argument of type 'void'
      verbatim. Otherwise, QDoc refuses to generate their docs
    - Add constructor docs for QOpenGLExtraFunctions (copied from
      QOpenGLFunctions).

Change-Id: I64a436365572a80319ba0a8eaba2f5d9b751e84d
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
9 years agoDoc: Update online documentation template
Topi Reinio [Wed, 20 May 2015 13:01:10 +0000 (15:01 +0200)]
Doc: Update online documentation template

Update the online documentation template with following fixes:

   - Improve responsivess for narrow screens: TOC and sidebar
     now collapse into drop-down menus
   - React to hashchange events: When the user edits the anchor
     tag in URL and presses enter, the page is scrolled
     correctly to bring the selected section title into view.
   - Handle Ctrl and Meta keys correctly
   - Improve colors for target section highlighting
   - Minor CSS fixes

Task-number: QTWEBSITE-634
Task-number: QTWEBSITE-657
Change-Id: I7221f38cf4988497f0f24ee66e62b7b7d770a121
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
9 years agoremove pointless function separator comments from tst_qprocess
Joerg Bornemann [Mon, 24 Aug 2015 13:25:57 +0000 (15:25 +0200)]
remove pointless function separator comments from tst_qprocess

Newer test functions don't have those. Removing those comments makes
the code consistent.

Change-Id: I542b89e797ef061395ce1fc87d848195e6f81f35
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
9 years agoBe more tolerant with multiple differerent metatype registrations
Olivier Goffart [Fri, 14 Aug 2015 14:09:21 +0000 (16:09 +0200)]
Be more tolerant with multiple differerent metatype registrations

There is a qFatal in qmetatype.cpp that checks that the flags are the same.

There is a binary compatibility break because if any cause build with Qt 5.5
is loaded, this qFatal will quit the application, due to the change in
commit 54a09a41885e65fea4ca20d0e3d90d8f4e9e80c5:

  Type flags for type 'QtMetaTypePrivate::QPairVariantInterfaceImpl' [1034]
  don't match. Previously registered TypeFlags(0x103), now registering
  TypeFlags(0x107). This is an ODR break, which means that your application
  depends on a C++ undefined behavior.

This is a false positive since it is an internal type, the MovableType in
QMetaType is only being used for performance reason, it is perfectly fine
to change it.

This commit changes the qFatal to complain only about flags that could
only be caused by a binary incompatible change.

Change-Id: I87b9bf8cf54b6c7f4b1277d411ce5107642435ab
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoibus: Return correct scan code to windows
Takao Fujiwara [Tue, 25 Aug 2015 05:54:31 +0000 (14:54 +0900)]
ibus: Return correct scan code to windows

ibus keycode is qt scancode - 8 and needs to be returned to app windows
as the right value.
Use QWindowSystemInterface::handleExtendedKeyEvent() instead of
QCoreApplication::sendEvent() in qtbase 5.6 to follow
QXcbKeyboard::handleKeyEvent().
Also qApp->focusObject() returns QMdiChild which is a QWidget and
that is not a QWindow.

Task-number: QTBUG-47833
Change-Id: Ie634a86d7790d8093cfca2dc8666f726844ae654
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
9 years agomkspecs: add option to enable boot2qt platform
Samuli Piippo [Mon, 24 Aug 2015 10:40:29 +0000 (13:40 +0300)]
mkspecs: add option to enable boot2qt platform

Add configure time option to enable boot2qt platform using DISTRO_OPTS.
On embedded, the QtWebEngine is supported only on boot2qt platforms.
To have QtWebEngine CI tested on embedded, we need a way to to enable
boot2qt platform for existing mkspecs.

Change-Id: I218da5b8071041ca1c95eb218b2d552fcc9980d2
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
9 years agoCocoa: Fix backing store performance regression.
Morten Johan Sørvig [Thu, 13 Aug 2015 19:42:10 +0000 (21:42 +0200)]
Cocoa: Fix backing store performance regression.

Commit 916dfcb8 introduced a regression where QNSView
would hold a copy if the backing store QImage, which
would cause a detach and deep copy if/when the image
was painted on while the copy was held.

Revert back to the previous share-by-pointer scheme.
Make sure the following bugs stays fixed:
    QTBUG-38377
    QTBUG-42206
    QTBUG-44313

Change-Id: Ib8049051d51947113f23b66ee61dc34c22388914
Task-number: QTBUG-46959
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
9 years agoBump PCRE to r1594
Giuseppe D'Angelo [Mon, 24 Aug 2015 08:53:00 +0000 (10:53 +0200)]
Bump PCRE to r1594

Get a couple of fixes for important bugs (1667, 1672).

The WinCE build patch has also been merged upstream,
so remove it from our tree.

Change-Id: I933c2d824612a70d7bc52648df5f5c481ae066d7
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
9 years agoFix potential crash in QWindowsWindow::setDropSiteEnabled().
Friedemann Kleint [Mon, 17 Aug 2015 11:18:28 +0000 (13:18 +0200)]
Fix potential crash in QWindowsWindow::setDropSiteEnabled().

Release drop target after CoLockObjectExternal() to prevent
a potential access violation.

Change-Id: I2c3bde9f8008b1d567544596f56ebfd61fe6ad86
Task-number: QTBUG-47737
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
9 years agoWindows/Input context: Update enabling of IME in in update(), too.
Friedemann Kleint [Thu, 20 Aug 2015 12:51:53 +0000 (14:51 +0200)]
Windows/Input context: Update enabling of IME in in update(), too.

Amend change b55f88caba339a49bf0ebabfa324dde523c2b866 by splitting
out the enabling into a separate function and call that when
QWindowsInputContext::update() is triggered to reflect updates
of the microfocus in QGraphicsView or item view widgets.

Task-number: QTBUG-47679
Task-number: QTBUG-47705
Task-number: QTBUG-40691
Change-Id: I84a6647944f1aaedcd72d7060cc90e29a177f577
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
9 years agoiOS: calculate bounds in desktop view using transformed window bounds for both width...
Richard Moe Gustavsen [Fri, 7 Aug 2015 09:01:09 +0000 (11:01 +0200)]
iOS: calculate bounds in desktop view using transformed window bounds for both width and height

Depending on the orientation, UIKit might shrink either the width or the height
of the view to fit the status bar. Since we anyway want the view to fill the whole
window, we simply ignore this, and use the bounds of the whole window directly.

Task-number: QTBUG-47506
Change-Id: I73294e5792f8d98fb0c0b0a42198207baca08e3c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
9 years agoFix lookup of Info.plist from mkspecs when shadow-building
Tor Arne Vestbø [Mon, 24 Aug 2015 10:25:29 +0000 (12:25 +0200)]
Fix lookup of Info.plist from mkspecs when shadow-building

Task-number: QTBUG-47450
Change-Id: I87c45154deecd09a5c75f09e607177fa42459e95
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
9 years agoQRasterPaintEngine: Don't detach QImage
Sérgio Martins [Fri, 26 Jun 2015 19:40:50 +0000 (20:40 +0100)]
QRasterPaintEngine: Don't detach QImage

Caught being detached a few thousand times per second.

Change-Id: I6dd5fd69d7d4f32048cdb7e4ac707f24df6c15f8
(cherry picked from commit 2a81516835c680c29f3de9241a8c28027624ce4f)
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
9 years agoDoc: Mention Windows limitations in QFileInfo permission methods
Kai Koehne [Wed, 19 Aug 2015 12:56:08 +0000 (14:56 +0200)]
Doc: Mention Windows limitations in QFileInfo permission methods

The limitation is already mentioned in the class documentation, but
IMO is severe enough to be highlighted in the documentation of the
respective methods, too.

Change-Id: I16c68eb41ab9d3a7698d7ef06f747cfd98a8aaff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
9 years agoQWindowsMimeImage: Revert image format handling back to Qt 4.
Friedemann Kleint [Mon, 24 Aug 2015 09:57:31 +0000 (11:57 +0200)]
QWindowsMimeImage: Revert image format handling back to Qt 4.

Effectively revert 9150563940f61be9fb17510be49c0734244866a5 for
QTBUG-11463 (offering only CF_DIB5 for images of format ARGB32) and
4018cd3529ded32f3434095a2da2568d52dfe16a for QTBUG-46848 adding support
for "PNG".

The changes broke pasting images into MS Office since it can only handle
plain CF_DIB and gets confused if "PNG" is returned as available format.

Task-number: QTBUG-47656
Task-number: QTBUG-11463
Task-number: QTBUG-46848
Change-Id: I9b641b4b912b7b16a2f58bc84fa09c28a64e91c8
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
9 years agoHarmonize input context selection
Bernd Weimer [Mon, 23 Mar 2015 10:53:16 +0000 (11:53 +0100)]
Harmonize input context selection

Input context selection works differently across platforms. On some
platforms it is not possible to request a specific context at all
(e.g. Wayland). This will be unified, depending on the environment
variable "QT_IM_MODULE", you will get:
- null:  default (platform) context, if defined (otherwise no context)
- empty: no context
- set:   set one, if it exists and is valid (otherwise no context)

[ChangeLog][Platform Specific Changes] Haromnized input context selection.
QT_IM_MODULE environment variable will be taken into account.

Change-Id: Ic8f826fbc6ace25941cd19b9b086943e848fbe01
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Nedim Hadzic <nedim.hadzic@pelagicore.com>
9 years agoDetect which C++ standard edition the compiler defaults to
Thiago Macieira [Sat, 1 Aug 2015 20:31:35 +0000 (13:31 -0700)]
Detect which C++ standard edition the compiler defaults to

Change-Id: I2991557a5cc74cd18e88ffff13f670bf25d5423e
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
9 years agoFix module reference in license header
Louai Al-Khanji [Mon, 24 Aug 2015 09:04:57 +0000 (12:04 +0300)]
Fix module reference in license header

Change-Id: I8efa30869e716d827e8463ef4285f8ff9357cc0e
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>