Bump package version to 5.5.90+alpha1

Change-Id: Id0306762e7fbca0613c57bc81146854b585bb48d

Bump package version to 5.4.1

Change-Id: I9a8b5a95719a6390b9dd5f937e7dd31eb90bc3ae
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Bump package version to 5.4.0

Change-Id: Id12327fa71510cad64feef42410611d5770551dd
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Updated to Qt 5.3.99+beta1

Change-Id: I22a367dd51d407ee741b9a1109068ca4b4a7ae44
Bug-Tizen: TC-1008
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Added .gbs.conf file to follow upstream tags format

Change-Id: I573d028fc5297a2bf4bc299142f44c81fc8934e8
Bug-Tizen: TC-1008
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Changed source package name in prep step to allow incremental builds.

Change-Id: Ia1e7ee307359ff2997ca48fe682dc5f5f646d741
Bug-Tizen: TC-1008
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Bump package version to 5.3.1

Change-Id: I6c14b62a4809635870afd9f6249afe34868e6877
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Bump package version to 5.3.0

Change-Id: I96a3961b8c38f01d9bd870cdff5db0caf96055d1
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Bump package version to 5.2.96+rc2

Change-Id: If3901224992924b628e4a85ce8cb74f2a84ab69b
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Added qtdiag and version bumped to 5.2.95+rc1.

Change-Id: I29baaf126a7a1d4be9cc1204f6bf9e127669752e
Bug-Tizen:TIVI-2416

packaging: Removed redundant line in files section.

Bug-Tizen:TIVI-2416

Change-Id: Id07f048f9959a293f45455fda373d0d1c4853bf0
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Added manifest file according to smack 3-domain model.

Bug-Tizen:TIVI-2416

Change-Id: I983645067965df072c0d5a38c88705beb5b258c9
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

packaging: add launcher for designer application

Change-Id: Ia713907cff8e6fc3014588934e802530d18d3fb7
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

Bump package version to 5.2.90+alpha

Bug-Tizen:TIVI-2416

Change-Id: Id7ee43622226bb8c3ca0f139b6a08c9329023b17
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Bump package version to 5.2.2

Tizen-Bug: TIVI-2416

Change-Id: I06b5d75b47a13e8698a3b9af6edc7873f2f3efee
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Bump package version to 5.2.1

Change-Id: Ic717ae323d1d8af2799c98fc3d88fe794d7a8d7f

Spec file adapted for Tizen

Import from Mer

winrtrunner: Use noquote() for all messages with file names.

The quote mode causes '\' to be output as '\\'. Turn it off,
add double quotes manually and use QDir::toNativeSeparators()
consistently.

Change-Id: I1738c64aca106d7e450ab8a5a40adc9a4595f062
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>

qtdiag: Output environment variables starting with 'Q'.

Obtain information on high DPI scaling and other variables
influencing Qt.

Change-Id: Ia3eb5eb1fb34276ff15a6dea49b2120bfcb107b7
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: Ic1c578187b99013c40fe686f98fc85d5917240fe

qtdiag: Output information on HiDpi scaling.

Task-number: QTBUG-46615
Change-Id: Iff96ca3c715a93f3e1e02c8896cfa9cccc7b7eba
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>

qtdiag: Adapt to Qt 5.6.

Output QPlatformScreen::powerState(), QPlatformScreen::pixelDensity()
and usage of native message dialog.

Change-Id: Iddde2ee93817fa33f381640475a04aeb76f88438
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
examples/designer/doc/src/arthurplugin.qdoc

Change-Id: I5c0118a90111b51db04d2ea2eb6b3c47f1fb761f

windeployqt: Fix handling of the --no-webkit2 option.

The option formerly was a boolean value and one if-statement
was overlooked when changing it into an enumeration value
of type ExlusiveOptionValue.

Task-number: QTBUG-47785
Change-Id: I6135a6268221841025fd05928cea50ffa6fbdea9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

Doc: replaced Mac OS X with OS X

Task-number: QTBUG-40759
Change-Id: I3dd691ec1f17ae3217cb85e6f3e6330114ab7aa3
Reviewed-by: Martin Smith <martin.smith@digia.com>

Add the GPLv3 license text

LGPLv3 refers to it but does not include it in its body.

Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

macdeployqt: Work around broken QLibraryInfo

Add fallback code path for locating qmlimportscanner
relative to the macdeployqt binary.

Task-number: QTBUG-46404
Change-Id: I9c837b5da518af45cef1292f9cd0422fccba8e5f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>

macdeployqt: Always print errors

Don't require -verbose=1.

Change-Id: I6c27c68635698984d8c1e2a1c4604a2b409d6b56
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>

macdeployqt: halt on missing qmlimportscanner

This is going to produce a broken bundle; stop
and print the error.

Change-Id: Ie58d357b97adc229393d80e9dde5e10c65c9bc99
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>

macdeployqt: strip the application binary

In addition to running 'strip' on the framework and
plugin binaries.

Change-Id: I90b1f50f8212d1399933d4cd5c35aaee8e5212f2
Task-number: QTBUG-17447
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>

Add option for skipping use of private API.

The qsqlodbc and qsqlpsql are known to cause rejections
from the Mac App store due to use of private/deprecated
API.

The plugins are deployed whenever the SQL module is used.
Due to this corse granularity of plugin selection apps
may find themselves rejected for plugins which they
are not actually using.

Make macdeployqt print a warning when sqlodbc or sqlpsql
is deployed. Add "-appstore-compliant" which will
skip deployment of the plugins.

Task-number: QTBUG-37835
Task-number: QTBUG-38607
Change-Id: I7325156ffaf228a97d7ceeb12f329b3f10db4ff2
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>

macdeployqt: correct process return values.

Task-number: QTBUG-9332
Change-Id: I684f640d38326f6607669501e0b20be663692fc3
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>

macdeployqt: Workaround for QtQuick.PrivateWidgets

Deploy PrivateWidgets if QtWidget.framework and
QtQuick.Controls is in use.

Task-number: QTBUG-45977
Change-Id: Id2d7af8895be136d84bed92043fc790b156d8dea
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>

macdeployqt: fix QML import deps deployment

The plugin deployment step needs to run after QML
imports deployment in order to take frameworks
added by QML imports into account.

Move deployPlugins() down. Update deploymentInfo.
deployedFrameworks after deployQmlImports() has run.

Change-Id: I1d9ce827b1c0205ec37f027d03a9b4a2bb846801
Task-number: QTBUG-46981
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>

Fix QML imports deployment when using path

During deployment the value of LC_RPATH on the main
executable gets updated with a new value pointing
inside the app bundle. This happens before QML
import deployment, which means reading LC_RPATH
at QML import deployment time will not give the
correct value.

Use the cached value stored in the DeploymentInfo
structure instead, which will point back to the Qt
installation.

Task-number: QTBUG-47390
Change-Id: Ide84240de408d2338c9f7a68a73849263ce69dff
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>

Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I53ac9eae2c1d1ccc7ab027146f354f19a3a6d2b8

windeployqt: Patch qt_prfxpath when deploying Qt5Core

Patch the preconfigured Qt path in Qt5Core to '.'. This allows one to
immediately test whether the generated package is self-contained, without
Qt being able to 'fall back' to the installed Qt for loading plugins. It
is also fixing a potential security issue where Qt tries to load plugins
from 'unexpected' places.

The effect is the same as adding a qt.conf file with all the defaults.
However, a lot of people consider adding a qt.conf ugly.

[ChangeLog][Important behavior changes][windeployqt] windeployqt now
changes the hardcoded QLibraryInfo::PrefixPath in Qt5Core to be relative
to the executable.

Change-Id: Ib59d84453913f28b806ae78a0ef138eb4f0045fa
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Update the processor feature reporting in qtdiag

Don't try to report on features from the wrong processor

Change-Id: Ib306f8f647014b399b87ffff13f2426ce9047e98
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Qt Designer: Add customizable property tooltips.

- Introduce tag propertytooltip to property specifications
  in the ui XML snippet returned by
  QDesignerCustomWidgetInterface::domXml()
- Pass the text to the property editor and set as description tooltip
  on the property.
- As an added benefit, show the type in the normal tooltip.
- Demonstrate using TicTacToe example.

[ChangeLog][Qt Designer] Added customizable property tooltips.

Task-number: QTBUG-45442
Change-Id: I371bbbb3a6f2bc0f433193b5eb45658211ca67de
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

Qt Property Browser solution: Split toolTip into valueToolTip and descriptionToolTip.

Make it possible to have different tool tips for the property name
and value.

Add comments pointing out the changes to be ported back to the solution.

Task-number: QTBUG-45442
Change-Id: I31571d3f502be20b7c0bb2c91cbd999e80ee49aa
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

windeployqt: Add option to suppress deployment of the software rasterizer.

Add command line option --no-opengl-sw to suppress deployment of
opengl32sw.dll.

Task-number: QTBUG-47449
Change-Id: I2bf9aab98c9b56e62640da3fa13052ccc5f163d8
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

Qt Designer: Clean up tooltips and value texts in property editor.

Remove code setting tooltips that duplicate texts already set in
DesignerPropertyManager::valueText() (which is used as tooltip
QtTreePropertyBrowserPrivate::updateItem(). Boolean values and
the paths of icons and pixmaps are the only remaining tooltips
that differ from valueText().

Fix display of the paths.

Task-number: QTBUG-45442
Change-Id: Iedb5936e52f051f38c9922285efc5136387f4442
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

windeployqt: fix build under GCC/Clang

Change-Id: I11d9e930474715ad87ff4968fe4f90f24c78cd27
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

androiddeployqt: Make it QT_NO_CAST_*_ASCII clean

This makes the codebase more consistent. Where appropriate, const was also
added to local variables.

Found by compiling Qt with QT_NO_CAST_FROM_ASCII/QT_NO_CAST_TO_ASCII.

Change-Id: If36859b74c2320265702bb8b357248e8777f0ae9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>

winrtrunner: Build under MSVC 2015

Change-Id: I59086cfe94b471eef1c11f0ba3f21e8fc8e34640
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Ib9420b128e30984aebf1f8eba8c0496e3913e69f

Prospective fix to make lupdate tests pass.

Suppress the qmake message about creating a .stash file. This should
fix failures like:

FAIL!  : tst_lupdate::good(heuristics) Output for /Users/qt/work/qt/qttools/tests/auto/linguist/lupdate/testdata/good/heuristics/expectedoutput.txt does not meet expectations:
 <<<<<<< got
 Info: creating stash file /Users/qt/work/qt/qttools/tests/auto/linguist/lupdate/testdata/good/heuristics/.qmake.stash
 =========
 >>>>>>> expected

Change-Id: I1f7737e7f8463fcd92a4faf7f87a484de72d0921
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

windeployqt: Add QtWebChannel as a module that can be specified

Change-Id: I76d7b871facf27af15036cfa48e4e7881a42aec2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

windeployqt: Deploy MSVC debug runtime dlls instead of redist package.

The redistributable package only contains the release mode DLLs, so
it does not make sense for debug builds. Deploy DLLs instead for
debug builds.

[ChangeLog][windeployqt] windeployqt now deploys the MSVC debug mode runtime
dlls instead of the redistributable package for debug builds.

Change-Id: I84e0ec784c3dde72f206ce69dcaf1169d0fe0fef
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

macdeployqt: Fix typo in help output

Change-Id: I4993a21c6544edf289e5ee6aa084647c4ad6e4b5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

windeployqt: Adapt to MSVC 2015.

The name of the runtime libraries changed to VCRUNTIME140[D].DLL.

Task-number: QTBUG-47334
Change-Id: Ibe9234e91801730afb2c0015abe94458fe22ba0f
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

windeployqt: Deploy new webengine resources

See change 7345ef65af262eb0b958905d7175cc836821cf25 in qtwebengine.

Task-number: QTBUG-47018
Change-Id: I325885dbdce1fa3c6130ad6c6271366bdb430d27
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

windeployqt: Deploy plugins in platforminputcontexts for QtGui.

Change-Id: I7fe4d21b078bf2e0812acb0f688fb64cb4fdfddb
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

Port Qt Designer to Qt 5 signals & slot connection syntax.

Use Qt 5 signals & slot connection with exception of private
slots and tool classes from the shared directory.

Change-Id: I2bf4bfbdff709d15c8ee4ae3de3039bf3d210d6a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

Qt Designer: Disambiguate signal/slot names in action editor.

Classes ActionListView/ActionTreeView overload the signals/slots
of the item views they inherit with action parameters, making
porting to the new signals&slot connection syntax unnecessarily
difficult. Change the names to contain the word action.

Change-Id: If8b9433e6ec14c5d68ee228a710c70057457324e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

Don't pass int by-ref in foreach

Change-Id: I78753657aed14969fc35614ffba7cf480609c7de
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

windeployqt: Fix deployment of Q53DInput.dll

Fix the typo in the name of the DLL.

Change-Id: I81df26d837c3294852eba688db701503f95aad66
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Fix -Wcast-qual warnings found by GCC

...by switching to static_cast

Change-Id: Iee8cbc07c4434ce9b560ffff13cef3f916f521a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
.qmake.conf

Change-Id: I2424cf97743b3f998bf7b10a21f8075ed76b613f

Bump version

Change-Id: I97bd7a6de4a0fa51789c0cee8cf0703e32429f6f

Merge remote-tracking branch 'origin/5.5.0' into 5.5

Change-Id: Idc7ad0119c9b37908fc432b31163a9b9e8f45734

Linguist: bring currently translated widget to front

Task-number: QTBUG-6713
Change-Id: I5ab5ee05a2257ff0978dd20bad5bdcf29e57159c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

windeployqt: Fix MSVC debug/release detection for WinRT.

Change 6c8954b07807e31dbc8967ba6d92d4d022073087 caused WinRT modules
to be detected as release always since the runtime libraries there are
called msvcp120d_app.dll / msvcp120_app.dll. Change the algorithm
to check on the first character after the version number.

Change-Id: I7eb645e9b94f21dd8daaf24f59009cc9c6f18c4c
Task-number: QTBUG-46629
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

macdeployqt: Fix rpath setting for additional executables

Additional executables can lie anywhere within the app bundle, so we
have to individually calculate the corresponding rpath instead of hard
coding to @loader_path/../Frameworks.

Task-number: QTBUG-46660
Change-Id: If213ad002b38a6690a30e7aeae47e201fdc4800c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>

windeployqt: Fix broken deployment of ANGLE.

Commit 48b5cb2e682fd58e60b5650366c0291020e8b264 (windeployqt: Add support
for x86 based WinCE) broke the if condition as revealed by g++:

main.cpp: In function 'DeployResult deploy(const Options&, const QMap<QString, QString>&, QString*)':
main.cpp:1189:77: warning: 'and' of mutually exclusive equal-tests is always 0
     if ((options.platform & WindowsBased) && !(options.platform & WinCEIntel) && !(options.platform & WinCEArm) && !qtGuiLibrary.isEmpty())  {

Change-Id: I91e8d4b93b1060330bff883f5eaa4eacc27e474f
Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

Add auto test for windeployqt.

Deploy test application and launch in clean environment
with qt.conf to verify that deployment works.

Task-number: QTBUG-46629
Change-Id: I3b73354b95e7e5c55c8f30991fbc9f7443176079
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

windeployqt: Detect -release -force-debug-info MSVC builds as release.

Factor out detection logic into a template for 32/64bit.
When a debug entry is detected, detect release if the
library positively uses the release runtime dll.

Task-number: QTBUG-46629
Change-Id: Ic34c2e3850e7f1945086da87867934c502026a2e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

qtdiag: Add new capabilities/style hints for Qt 5.5.

Change-Id: I88bd49fb6b426a061f24b759cfa17553bfa90a3c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

Add missing private headers warning

Change-Id: I61cecd5065d4bb3b32dd7b50cbfe866071e76dbe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

windeployqt: Print warning when MinGW runtime cannot be found.

Task-number: QTBUG-46458
Change-Id: I102eb6b902e9f59e7abacae611b5ad32dbe64eeb
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

macdeployqt: fix plugin deployment.

Set deploymentInfo.deployedFrameworks again, which
was accidentally removed by ad31b989.

(The plugin deployment logic uses deployedFrameworks
to determine which plugins to deploy.)

Task-number: QTBUG-46494
Change-Id: I0d6168cc8e646d519578d24dc0a35f0836d3be7b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

Fix CLucene compile error with VS 2015.

Task-number: QTBUG-45961
Task-number: QTBUG-45976
Task-number: QTBUG-46344
Change-Id: Ic001298e96ae474a4939c445b7816a331135dd53
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Ie29b7ff968808d1cca2864016445bc1c973a124f

windeployqt: Add support for x86 based WinCE

Adapt windeployqt to support x86 based WinCE systems
in parallel to arm based WinCE systems.

Change-Id: I855db447524ebc55c68af5eaecbf9f6a448d9ed8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>

Doc: Removed the qdoc page for Arthur Plugin example

The example was removed in 2d750edc

Task-number: QTBUG-41996
Change-Id: I778ef5d3af53be73bba37d99498960d2f766a53f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>

Qt Designer: Disambiguate the modules where widgets come from

- QWebView is from "Qt WebKit Widgets", not "Qt WebKit", "Qt WebView" or
  "Qt WebEngine Widgets"
- QQuickWidget is for Qt Quick 2, not Qt Quick 1

Change-Id: Ifd3395cbbe632b0d17b37658044318ddf04770c9
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Linguist: do not override the roles of Edit menu items

The menu items were staying disabled whenever the File dialog is open,
so it was not possible to use them to cut/copy/paste into the native
FileDialog (or its child sheets) on OS X.

Task-number: QTBUG-17291
Change-Id: I0b821bd85d6d614ad845f594e4d8d994e1386d94
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>

Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
.qmake.conf

Change-Id: I47fe486745efad44537255a56087f4ec0a3b2e82

Fix the include for QQuickWidget

Task-number: QTBUG-46139
Change-Id: I499b2fdaaf2ca72350a83a5a8a75eac94f0bcd76
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Fixup "androiddeployqt: Use correct package name when uninstalling"

This partially reverts commit 30329ce24004a54e0bd1bbeff2b139ab13bb6946,
making sure that updateAndroidManifest() works as it did before.

Change-Id: Ia6c28985224ffaa36063e7195e32864c4ce0b67e
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>

Updated WinRT license headers to use LGPLv3 instead of LGPLv21

From 5.5.0 -> WinRT port is licensed with LGPLv3, see
http://blog.qt.io/blog/2015/04/29/windows-10-support-in-qt/

Change-Id: Idd2bd07705a9ccdc80d22e896acc42141a96d3ee
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>

Qt Designer: Fix widget box settings.

The group name was used with incorrect case, which
no longer works in Qt 5/Linux.

Task-number: QTBUG-46201
Change-Id: I2be0eb74058dc2c7f5d36b0c5c53d04e50b41b36
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

Qt Designer: Update widget box labels

- Use correct names for 3rd-party technologies ("OpenGL")
- Use appropriate capitalization ("MDI Area", "Key Sequence Edit")
- Make labels as similar to the corresponding class names as possible
  (QDialogButtonBox, QCalendarWidget)

Change-Id: I3d9b1b77b62444496589c7c4a80f3ffb86f27e67
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Qt Designer: Introduce Q_DECL_OVERRIDE.

Replacement done by a script and verified with clang 3.5 to not cause
new warnings.

Change-Id: Ibaa1efe91cd65a6b54591a629b7335aebc0803bf
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

Update Qt Designer documentation.

- Document new QUiPlugin module.
- Fix example documentation to reflect the changes in
  the qmake variables (QT/CONFIG).

Task-number: QTBUG-44724
Change-Id: Idd85d601295af25d634c3186e993abc7090fe002
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

MacDeployQt: handle "./" in app bundle name

Use QDir::cleanPath() to normalize the app bundle
path.

Change-Id: I35053507dd11de986b9f43276e41d9fe3eff0fca
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>

androiddeployqt: fix possible infinite loop.

Change-Id: Id9965521f69c999a417d2b1f54b49b145dd4f32c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Ice083b71518d645bf411f1275826e928df797242

Test the Qt5UiPlugin cmake module with CMake 3.0.

Test that the forwarding headers work when using the QtDesigner module it
was extracted from.  Test that transitive usage requirements of the
Qt5::UiPlugin module are available through the usage of the Qt5::Designer
target when using CMake 3.0.

Change-Id: I200b5cf111f0160be2504727ab4111ce8a1d6170
Reviewed-by: Stephen Kelly <steveire@gmail.com>

move ui loader interfaces to own module

it's backwards to declare the interface as part of the designer library
itself, as that obviously pulls in half of designer itself into custom
widget plugins which should be perfectly usable from the stand-alone
ui loader in uitools. also, designer isn't built for embedded systems,
so the bundling needlessly limited the availability of widget plugins.

so move the relevant headers into a separate include-only module.
the designer module retains forwarding headers, as the old includes
obviously need to continue working.

[ChangeLog][UiTools] Custom widget plugins should now use QT+=uiplugin
instead of QT+=designer. This makes them usable on embedded systems.

Task-number: QTBUG-44724
Change-Id: I5535b10d2f095b257eeda9681f60b2f8c699f7d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

fix exported dependencies of uitools module

move the include which declares the correct dependencies to a place where
qt_module.prf can see its effects.

Change-Id: Iba5e2569e35de0b28b75042d49186077f49a06bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

remove extension.h duplicate

it was there only because uilib used to temporarily live in qtbase.
however, the header's inclusion into customwidget.h was pointless in the
first place, so just nuke it.

Change-Id: I85b89e397e4393987192de05ec74e8c2328d2b32
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>

move container.h to sdk/

QDesignerContainerExtension has absolutely no business in uilib - it's
not about dynamic .ui loading, but a customization of designer itself.

Change-Id: I4fe9acf2c07bc06e0f0d34c541e5d6300a1dc7ce
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Fix misoverloaded virtual due to recent change in qtdeclarative

qtdeclarative/9d7b27f5bf44 changed the method's signature.
Added Q_DECL_OVERRIDE so it doesn't happen again.

Change-Id: I98cbd521d8b115c12f00b35a53fc1b773e339160
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

windeployqt: Additionally check on Qt5WebKit[d].dll for ICU dependency.

Qt 5/Windows is no longer configured with -icu by default, only QtWebKit
still depends in it. Its library needs to be checked for ICU as well.

Task-number: QTBUG-45962
Change-Id: Ib08c2ece446f4f1cc4db2410fc0e554363181a6c
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

winrtrunner: Remove the app when stopping on Windows Phone

The native API fails to stop the app, but removing the app will
successfully stop it. Until we have a reliable way to stop the
application, simply remove the app instead.

Task-number: QTBUG-41946
Change-Id: I98662103a7242f806e2eb5ef06cfd60372df681a
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>

winrtrunner: Remove Xap engine

Windows 8.0 and Windows Phone 8.0 support have been removed from Qt, so
remove references to them in winrtrunner.

Change-Id: Ifcb6f60b6122b94ff453aa23334263d4b828608a
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

androiddeployqt: Use correct package name when uninstalling

When calling androiddeployqt with "--install --no-build", it will try to
uninstall a package with a wrong package name. This patch attempts to
read a valid package name from the AndroidManifest.xml before
uninstalling.

Task-number: QTBUG-45433
Change-Id: If2bc788753a24dd752492464c985de70c67b8f72
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>

invalidate message index when inserting in the middle

subsequent offsets become invalid when a message is inserted in the
middle, so the index must be invalidated (adjusting the offsets on the
fly doesn't seem worth it).
also, there is no point in updating the index if it is already invalid.

Task-number: QTBUG-45831
Change-Id: I9733cb3235c6b8b09dee7eae4d2ecf0a0cdda528
Reviewed-by: hjk <hjk@theqtcompany.com>