qtconcurrent/generaterun: adapt to earlier changes in qtconcurrentrun.h

Except for the license header and the new auto return functions, the
qtconcurrentrun.h header is now reproduced faithfully again.

Change-Id: Ib3b1ec10e75ddfb8e4bd8f7d765ce9d2fc1fc4f9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

qtconcurrent/generaterun: adapt to run(QThreadPool *pool,...)

The output is still very different from the checked-in file in QtCore.

Change-Id: I02f7489867b891c7867deebd33a39547c16923e4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

Update qtdiag to match the new function names in QSysInfo

Change-Id: I005fa3218755da186e5272fa566e5cdcb83b0b9c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev

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

Manually adjusted src/androiddeployqt/main.cpp
after 73e4f9593abecad68b39bbf68564a92dff5222e6
Patch by BogDan Vatra.

Change-Id: Idcf4ae7f54346119ee09001b1b55225a08dd9b21

Remove d3dcompiler_qt from deployed libraries

This library was an experimental feature that has been removed from Qt.

Change-Id: I9bb6fb8a4392bd9e99b8f7e23212e3ff5c84a638
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Remove qtd3dservice

This was an experimental feature which is no longer required or maintained.

Change-Id: I6b4541f402eeb30e8619876ce7293bff79f1b8c4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

androiddeployqt: qmlimportscanner support

Enables qmlimportscanner support in the deployment tool. Will
use the root path set by qmake to determine dependencies, which
by default will be the location of the project's .pro file.

Other effects: This removes the requirement to add QT += foobar
to enable using imports from the module QtFooBar, and it also
enables adding custom QML imports.

[ChangeLog][Android][androiddeployqt] Added support for using
qmlimportscanner to detect QML import dependencies of application.

Task-number: QTBUG-34175
Change-Id: I5af5964f9e453121eeff8b442f0c5e72676b1fbe
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Display the selectors from QFileSelectors in qtdiag too

Change-Id: I708140d95e04d37d8593c1ff2f16ffa2b759abe0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

qtdiag: Display the detected OpenSSL version number in hex

It's a lot easier to read 0x1000108f than 268439695.

Change-Id: If3f647563655046e69d65d022f7b1e9e3fb445cc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

qtconcurrent/generaterun: allow to pass the output dir as an argument

The hard-coded paths don't exist anymore.

Change-Id: Ie993f0a08d9dc2d89fa08911c18a09706af2fa24
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

qtconcurrent/generaterun: compile

Change-Id: I9f3e08d93effaf2f6b6d07136d0867f13c6cd95d
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

Android: fix zipAlign location.

Stating with android tools v23, the zipAlign tool was moved from
<android_sdk>/tools to <android_sdk>/build-tools/<build_tools_version>.

Task-number:QTBUG-40481
Change-Id: Id9207b6e382b0e79522d9fc529453ccd39aebe0d
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Display the detected architecture in qtdiag's output

The build architecture is part of QLibraryInfo::build()

Change-Id: I38b4d8711fce2f431eadb886d42e76be268b2b58
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Merge "Merge remote-tracking branch 'origin/stable' into 5.3" into refs/staging/5.3

Fix compilation of qtdiag.

Adapt to changes in QSysInfo API.

Change-Id: Iae95ed9f10f260f9c89cb27b6f50a13322fa8068
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>

androiddeployqt: Force Qt Gui dependency for all apps

Currently, the only way to launch an Android application is through
the platform plugin, which of course depends on Qt Gui. This causes
problems running corelib autotests, since they have QT = core in
the .pro file and thus will not deploy or load the platform plugin.

At some point, we may have a way to launch pure corelib-applications
on Android (like services), but until then, we need to hardcore the
dependency on Qt Gui to make sure these autotests run properly.

Change-Id: Ica794af972a06ec021c1fa28333866296eab96e0
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Merge remote-tracking branch 'origin/stable' into 5.3

Change-Id: I8c3a43456ee3e378adbbda0d528d06201fd87256

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

Change-Id: Ia75281ed8c11fcd49a5cad55a4caa3c75fa670e9

androiddeployqt: Refactor findFilesRecursively()

Currently, androiddeployqt expects all the detected dependencies
to reside inside the Qt installation directory. Once we add support
for the qmlimportscanner, however, they can reside in any of
the qml import paths. The refactoring prepares the code for this,
separating the relative path (the path of the file when it is
installed on the device) and the absolute path (the source file).

Task-number: QTBUG-34175
Change-Id: I5173034a02e29f88f8ca6f2b61c0caea6ba71778
Reviewed-by: BogDan Vatra <bogdan@kde.org>

windeployqt: Clear read-only attribute when copying files.

The deletion of the empty QML directories fails when not doing so.

Task-number: QTBUG-40152
Change-Id: I0ff78440646239897b4867c3b3cfe1af8b2769f9
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Doc: Removing url variable from qdocconf file.

-url inherited from the url variable set in qtbase/doc/global

Change-Id: I69623cfe4f1a0b5c7aee52134bedbf04646ed22f
Reviewed-by: Martin Smith <martin.smith@digia.com>

Disable tests for linguist when cross compiling

Change-Id: I724bfa5d6ad0d8757e6ff10d9444d5f26d3d5270
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

WinRT: Disable some examples

assistant uses IPC, which is not supported.
Using the designer library is completely disabled for WinRT.

Change-Id: I7f569fe975c16dd3f3ce8744d1ed5c06a84d8da6
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

fix CLucene build for MSVC 2013

Commit qtbase/9f0e5d00ab51cc7c0dc87c8d72f48c4e6edaf120 added the
/Zc:strictStrings compiler option to MSVC 2013 builds.
We're circumventing the problem by throwing const_casts into the code.

Change-Id: I45cc647b780f834b756caed92c4d6f9a50a53664
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

qtpaths: add missing GenericConfigLocation, exists since Qt 5.2.0

Change-Id: I4d4ef2e0f33896984f436df6c9a033dd89866665
Reviewed-by: Sune Vuorela <sune@vuorela.dk>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

macdeployqt: remove accessibility plugins that no longer exist

Change-Id: Icd87b10d8173b6a97ddc5099298360084eb7d624
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

Ignore local and non-filesystem qml imports.

Make macdeplpoyqt deploy qml imports from Qml2ImportsPath
only. js and local imports should be deployed as a
part of the application build. Remote (network) imports
should be loaded at run-time.

Task-number: QTBUG-38533
Change-Id: I322f588912bcbb65fbc45676faaa3de76d625bef
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

consistently use organization name QtProject

This affects the location of the QSettings files or registry entries.
Other parts of Qt are using this organization name so it's good to
have all the settings in the same place.

Change-Id: Icbe61ab188b5561f935d959fdbaa885fbff4c3ec
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>

windeployqt: Added Qt 5.3 modules to module list

Additionally 64 Bit usage for the flags was cleaned up and the order
of modules was changed so that they are sorted now.

Change-Id: If5b52dee6e1f48218313db96a03ac1e5380e73ed
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

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

Conflicts:
.qmake.conf

Change-Id: I3c04b4c45c1c8dd29ddc4f27043654baff3adaf3

winrtrunner: Prevent crash when closing run engine

Close the package factory before calling CoUnitialize(), as it may
crash the application otherwise.

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

Add the dump of qCpuFeatures() to qtdiag

Change-Id: I6a094e755b9faf4a0f52adb7199bc2695b2a1468
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Bump version

Change-Id: I1cd3e87dbc75c3b2ae1bcaec7311ce8ceba530b5

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

Change-Id: I9580b6fee5533456feeed20045327c3746a73240

Merge remote-tracking branch 'origin/stable' into 5.3

Change-Id: I78a250e8631706606e6b003b28cdfb90ad692abc

winrtrunner: Support Windows Phone 8.1

This allows the runner to deploy to Windows Phone 8.1 devices
and
emulators.

The following limitations are noted:
- App argument passing doesn't currently work. A workaround
could be to
  modify the entry point in the AppxManifest.xml, which would
also
  require changes to qtmain. WP8.0 already uses a similar
workaround,
  but this is messy and should be avoided if possible.
- Querying for the application state doesn't work, so -wait
won't exit
  if the app stops. A workaround for this exists in WP8.0, by
passing
  the -qdevel parameter to the app, but this is invasive. If
an
  alternative can't be found, this can be fixed in a follow-
- Stopping applications doesn't appear to work (the API call
succeeds,
  but the app remains running). One workaround is to -remove
the app.
- Getting the exit code still isn't possible.

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

winrtrunner: Add an inherited method for creating packages

This method can be used by AppxEngine subclasses for creating package
(*.appx) files.

Change-Id: I7aab9bced144353c3c9e8cf6fbb914bd2f5b7fbb
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

winrtrunner: Move COM initialization into the private class

This ensures Appx engine subclasses get COM initialized in the same way.

Change-Id: Ib376842f808488353d19fe36c76bb2411332c0e4
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

windeployqt: Remove deleted QML directories from Json output.

Rewrite JsonOutput to use a QPair<> of strings and add function to remove
all entries of a target directory.

Task-number: QTBUG-39626
Change-Id: Ie4602deb45d60fdddab27f264ecf34b72f839254
Reviewed-by: Andrew Knight <andrew.knight@digia.com>

Merge remote-tracking branch 'origin/stable' into 5.3

Change-Id: Ided10fa5438cc1bd9a34fd8ded4bbd456abfe686

Doc: Remove Qt Designer manual from the licensing group

The Qt licensing information page will link to the Qt Designer
-specific information directly.

Task-number: QTBUG-35362
Change-Id: I293402a8024f33b68446497a50b9782803d20761
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

winrtrunner: Split AppxEngine into abstract base and Appx Local subclass

This allows common code to be reused in future Appx engine types.

Change-Id: I4e0ba09242eee6687604abe65d556a96a79346f4
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

qhelpgenerator: Fix warning about qpa_minimal_plugin usage

  Project WARNING: CONFIG+=qpa_minimal_plugin is deprecated. Use QTPLUGIN.platforms=qminimal instead.

Change-Id: I9f07c5033e0022e00c45e52570fe001856f13ca8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

CoreCon: mark destructor as virtual

This was causing COM to not get uninitialized and resulted in
winrtrunner hanging.

Change-Id: Ie3e409a43f2cb41f28ef6975d81c68996554861f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

CoreCon: Support API Versioning, and add Version 12 (WP8.1) support

While intrusive, versioned headers and a templated backend allows
apps like winrtrunner and qtd3dservice to access multiple versions of
CoreCon, allowing for simultaneous support of Windows Phone 8 and Windows
Phone 8.1 devices. This also allows for simple addition of future
versions, should there be a need.

Applications using these headers should use the versioned API instead
of the original ccapi.h. This has been fixed in winrtrunner and
qtd3dservice.

Task-number: QTBUG-37771
Change-Id: I70cad98a2bf7f232dfd92f1c068cf0e1a8eadf88
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>

windeployqt: Observe qtlibinfix.

Determine qtlibinfix by checking on the Qt5Core library name
and re-apply that when building the module names.

Task-number: QTBUG-39297
Change-Id: I73d1253ddd803071f90199fa9aaee7328c7aae8c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

Exclude qtdiag when QtGui is not available.

Task-number: QTBUG-39118
Change-Id: I54f6879ef58e5b7b7bc2c20840524f4af5433921
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

windeployqt: Add missing "audio" plugins for QtMultimedia.

Task-number: QTBUG-39157
Change-Id: I88055eed7b430c14e1d1e13bdeee558a63763d8d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

windeployqt: Adapt to dynamic GL switching.

Add command line options to enable or disable deployment of ANGLE.
Detect dependency on ANGLE from platform plugin. Detect true
if neither a dependency on ANGLE nor opengl32.dll exists (dynamic case).

Task-number: QTBUG-36545
Change-Id: Ic46b93fa79ca2527e08b780862e699ab12e2861c
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>

Merge remote-tracking branch 'origin/release' into stable

Change-Id: I2a54387a58f44518cddd5f5ac10c43cf29205d6b

androiddeployqt: Add option to reinstall apk

Mainly for consistency with the old deployment method in Qt Creator,
androiddeployqt will uninstall any previously installed instances
of the application before installing it. This will remove any caches
or user data stored by the application. In many cases (most) it
would be more convenient to just overwrite the existing instance,
but keep all caches intact. This patch adds the --reinstall option,
symmetrical to --install. If enabled, the uninstall step will be
skipped.

[ChangeLog][androiddeployqt] Added option to install an APK without
uninstalling previous instances of same application.

Task-number: QTBUG-35845
Change-Id: I93bed4fefda6ed5295f333002a4958654b3f911c
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Let qtpaths return a failure to the caller if it found nothing

Otherwise, the only hint that we get that nothing was found is an empty
line. You could detect that from a shell by assigning to a variable and
checking if it's empty (provided $IFS is set to a newline). But a return
value is much easier.

Change-Id: I00608be8a23a487c9f90a4080479c8f527a8eb3f
Reviewed-by: David Faure <david.faure@kdab.com>

windeployqt: Consider plugin dependencies.

Pass the disabled libraries to the plugin find function and
make it add new dependent Qt libraries.

Task-number: QTBUG-38943
Change-Id: I5b4eaeb9f25dede738465ba19062f99bda15250b
Reviewed-by: Andrew Knight <andrew.knight@digia.com>

androiddeployqt: REG: Fix running tools with spaces in path

The popen() function on Windows executes the command using /s,
probably for legacy reasons, which causes the behavior that it
removes the first and last quotes in the command line and otherwise
preserves it perfectly. This causes strings in which both
the executable name and at least one argument has to be quoted, to
be unparsable by the shell once it has been processed. To work around
this we wrap the string in quotes on Windows.

Since we added quotes to arguments for the jarsigner command in Qt 5.3.0
we introduced a regression that made it impossible to sign APKs on Windows.

Task-number: QTBUG-38962
Change-Id: I2b618e1996753645766d25ca06b14e1985d7eacd
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

androiddeployqt: Remove warning about missing dependency

In 08672adb97c0707c513850a27aaec59327874260 in qtbase, the
MODULE_PLUGIN_TYPES of QtGui was expanded to contain some
more plugin types which are not built on Android, causing
warnings during every deployment. Since MODULE_PLUGIN_TYPES
is common to all platforms we should just ignore it if it
specifies plugins that do not exist.

[ChangeLog][androiddeployqt] Remove warning about missing
dependency.

Task-number: QTBUG-38651
Change-Id: I57a2c1d79b859981b3adf2772be4f0cd8a98be12
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

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

Conflicts:
.qmake.conf

Change-Id: Ib20f075f0ffa8cf0b64dad2dcd6ede825d36a551

Print the OS version using QSysInfo

Change-Id: I1fd7df2ba131529d85ce5ffa4e99bcea63f0b8fe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Remove the big/little-endian message from qtdiag's header

It's now included in QLibraryInfo::build(). That is:

Qt 5.4.0 (x86_64-little_endian-lp64 shared (dynamic) debug build; by GCC 4.8.1 20130909 [gcc-4_8-branch revision 202388]) on "xcb"

Change-Id: Ic68221f628be62ab64859ebb80059f753aa54cf1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

windployqt: Fix cross-compilation.

Fix signature of readPeExecutable().

Task-number: QTBUG-38160
Task-number: QTBUG-38886
Change-Id: I3ff88d502e0f9f7912b4c0741667a8f4ff71dbba
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Extend androiddeployqt features

Makes it possible to specify a set of runtime dependencies to be bundled
with the application to be used afterwards.
To do so, adds a new entry in the json file named "android-extra-plugins"
that will specify those dependencies in a list.
It will put the text files within the assets directory and the libraries
and plugins in the architecture's directory in libs/.

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

Remove extra newline between the font listing and native dialog

They're all part of theme grouping.

Change-Id: I1ecc6f4eee0abbcf4ac76f585b6524d6f7027a34
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Print the password character using the form U+XXXX

Change-Id: I5d901e6471509cb0f5177724d94912becf258182
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Explain what the * are in qtdiag's output or remove them

Change-Id: Ie5c43c88d51d282bde4e1d91e86b95e4e5c4e91f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Remove unused function from qtdiag.cpp

qtdiag.cpp:175:20: warning: ‘QStringList toNativeSeparators(QStringList)’ defined but not used [-Wunused-function]

Change-Id: I66c5d5d54aa1987393d3dc35c2ee4ff4f17af442
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

No longer deploy image files and sources of QML imports.

These files can be omitted for the Qt Quick Controls and
Qt Quick Dialogs modules.

Task-number: QTBUG-28766
Task-number: QTBUG-31565
Change-Id: Id02939a7124cd5db83d81dcc59663ddf4d091f70
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

androiddeployqt: Support bundling library projects

Third party library projects can easily be added to the Android
package source directory and added to the project using
project.properties, but "android update" needs to be run on it
to produce some local build files before it can be included in the
build. We can do this for people so that they can use third party
library projects without having to put build files in their source
directory.

[ChangeLog][Android][Deployment] Detect linked library projects
in the package source directory and automatically run "android update"
on these.

Task-number: QTBUG-38322
Change-Id: I0bf9b8708a7ec28ed5429379215b12a65d05416a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

Merge remote-tracking branch 'origin/release' into stable

Change-Id: I311a5d7b5177dd0cea49ed2d4d9125b27d3ba5e0

Android: Fix deploy failed for debug mode

E/dalvikvm(10899): dlopen("/data/local/tmp/qt/lib/libQt5Quick.so") failed:
Cannot load library: soinfo_link_image(linker.cpp:1635): could not load
library "libQt5Qml.so" needed by "libQt5Quick.so";
caused by load_library(linker.cpp:745): library "libQt5Qml.so" not found

Task-number: QTBUG-38606
Change-Id: I8fcb42782a835842a69b0b4d2de4f1ed042555c6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Update qtdiag to use renamed symbols

Change-Id: Ic2d40cf76efa63f12f2dde1a02c8938f355851b1
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

qtdiag: Dump writable locations of QStandardPaths.

Indicate writable locations by asterisks.

Task-number: QTBUG-38483
Change-Id: I3e5efbd6db032b4feaee2b5013a9304c6cbfc73d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Bump MODULE_VERSION to 5.3.1

Change-Id: I49f696c528ec631cdc5aac2dc3f0402646a14de0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Merge remote-tracking branch 'origin/release' into stable

Change-Id: If733be66da6ef6b1e28ec6ba180beafea6c9990d

Skip qtpaths on iOS

Change-Id: Ie31615c62d228d23fab8d8eb5bcbcaf80957403e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

Polish qtdiag.

Add missing platform capabilities, style hints.
Output network configuration, add command line
option for GL extensions.

Change-Id: I98277bcc0df578381cfd13d80e3ed60156769799
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

CMake: Add an IMPORTED target for qcollectiongenerator.

This makes it easier to generate assistant documentation with
Sphinx, for example.

Change-Id: Idb45ec47f3c2bcf8a6df313380abf71a4c5a7da5
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

CMake: Add a lconvert IMPORTED target.

Task-number: QTBUG-37937
Change-Id: I3d389f8a96b04b8d94d13990d55a88bb5637a1e3
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

CMake: Check that executables in the linguist package exist before use.

Change-Id: Ifaaff157a836e3ebfb94b563631b65a226ed0d8c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

Include CMakeParseArguments in Qt5LinguistToolsMacros.cmake

This is shipped with CMake 2.8.3, which is the minimum version of
CMake required anyway.

Task-number: QTBUG-38375
Change-Id: I48c155f9532fafe2b91544a93cf489f238f0b9d9
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

androiddeployqt: Escape arguments to shell tools

Code is borrowed from qmake to escape and quote arguments passed
to shell tools as needed.

Task-number: QTBUG-38249
Change-Id: I4932df3963b0c1706374b4ba78c5e23c8e3304d2
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

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

Change-Id: I22263a047dc2e7fbcfda4a28b6aa0f52f216a72b

windeployqt: Fix check for MSVC 64 bit debug build

Fix a regression introduced in commit e2710f83dfad87b938009.

Change-Id: I2d5fc15cfd52a6901fa5e44b97af0996650da6dd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Fix check whether PE file is a debug build for MinGW

Use code inspired by objdump / pfd library to decide
whether a MinGW PE file is a debug build, or not.

Task-number: QTBUG-38160
Change-Id: If6b6136238eb7962a948ea7168fb3a8f8f87e323
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Remove exclamation marks from messages

Exclamation marks should usually be avoided in message strings (even in
error messages).
See also: http://qt-project.org/wiki/UI_Text_Conventions and other
HIG guidelines.

Change-Id: I0a4cc7c03cf64b130a2b32c1d77143e80e3e4024
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

Fix compilation of windeployqt on platforms other than Windows.

Task-number: QTBUG-38203
Change-Id: I0c099f5a6af15234bc21ec757f3e710de2841d20
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

qtd3dservice: Add options for retrieving shader information

To ease packaging shaders, the following command line options are added:
- list-source: List the shader sources
- list-binary: List the shader binaries
- qrc: Output in QRC format instead of a list

Change-Id: I2041523c25f940e3ced23ca32d347807babcade7
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

make QtDesigner claim plugins of type 'designer'

Change-Id: I76c0628551cef19719c73d84ad69b94db43064c7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Remove GLES1 switch branch from qtdiag.

GLES1 was removed by
qtbase a4ec90175c76ce35688acc06cdf93e9cab886223 .

Change-Id: I6d07ac6e2f2e51c41876dc383aef77ce57f76128
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

windeployqt: Add compiler runtime.

For MSVC, add the redistributable installers.
For MinGW, add the runtime libraries.

Task-number: QTBUG-28766

Change-Id: Ia1a32d14d8a924ab72cd6fc1ef87f4fd8d9454f2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

winrtrunner: Return true when receiveFile succeeds

This was mistakenly returning false in all cases.

Change-Id: Ib3d9c41529d5cda960e59b2412e809bed74ec4ca
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

winrtrunner: Pass the relative executable as part of ImageParams

This is required in order for a proper argv[0] to be available when
ImageParams is used.

Change-Id: I3b3151303d5ff764113a000f1a02c94e7b4e5db9
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

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

Change-Id: I084c5a6e44236c96f926d4d0eca4ea0544f28fa7

windeployqt: Disable d3dcompiler deployment on WinRT

This is no longer necessary for WinRT 8.1, because d3dcompiler_qt links
directly to the d3dcompiler.

Change-Id: Ic1d1261e9d16290ca7d4c2c5305d04092674333e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>

winrtrunner: Accept backslashes as well when looking for manifest file

The mapping file might contain paths having slashes as well as
backslashes as separators. When looking for the manifest file in this
list the kind of separators used should not matter.

Change-Id: I80e36f3bc4d3f80c34291bfa845b345f5638f88d
Reviewed-by: Andrew Knight <andrew.knight@digia.com>

Add position and sensor plugins to deployment

Those two have been missing so far from the list and got skipped,
causing runtime errors.

Change-Id: Ib32171ca20fe34b39aa93d53f18cb0ce0197b57c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Fix dependencies in Qt Designer, Qt Linguist documentation.

Change-Id: I4cb3086a998112c035733c447a3687fc4441887b
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>

Fix some documentation errors.

Change-Id: I1aa99b483c1cc4accba185bfdee12397af617e50
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Add more visible/accessible font zooming in Linguist

Makes font zooming more visible by adding it to the view-menu.
In addition to Ctrl-+/- or Ctrl-ScrollWheel for controlling
font size it is now possible to control it by using the two
new menu items, increase and decrease, in the View->Zoom menu.

The font size can also be reset by using Ctrl-0 or a menu-item.

Task-number: QTBUG-37561

Change-Id: Ie3e61a138d007ea5435ef67e111aaa845f126081
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>