Use a patch similar to qtbase/v5.2.0-alpha1~74^2^2~38 (Fix usr-move
workaround in the presence of multi-arch., 2013-08-30) to include
the appropriate calculation.

Task-number: QTBUG-36673
Change-Id: Iea0b6c64c5959d7d6dfce922c41031183c1c23d9
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

Change-Id: I54f9a114650dce691881f3395bbef4cd05dc6634
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Change-Id: Ie0f87232db5eeab4b2f3c36cd5e209fce727a40d
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

To avoid conflicts with multiple services running in tandem, create
a lock mutex and prevent starting multiple instances.

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

The control handle event is closed by the service class destructor, and
the worker thread handles are closed by their destructors. So, only
directly close the emulator/phone handles at shutdown.

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

Removes -install/-remove options and all traces of the Windows
Service API usage and credentials utilities. The -direct option has
also been removed and direct starting has become the default behavior.

This was a failed experiment. Even after solving the problems with
running the service as the local user, it was discovered that the
required session objects were inaccessible outside of the service,
making emulator support unattainable in service mode. Furthermore, the
direct mode evolved to match the service mode's device trigger
capabilities, making the service mode more obselete.

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

This works in service mode; the HKCR lookup did not.

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

As the service is automatic now, remove these options before the
utility is released these become "API".

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

As IPackage2 seems not to be available for VS 2012 the check is
disabled for now. We might be able to check, whether the application
uses Qt libraries, but that can be done in a followup commit.

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

Spaces were missing and the executable was printed twice.

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

This was breaking for prefixed builds.

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

Look in the bin-directory of the Qt SDK first, then check system
and make sure the word size matches.

Task-number: QTBUG-37299

Change-Id: Ib1941c79cbc931aa67090bc08a5f7c1798e2a245
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>

Like Xap monitoring, local appx packages can be automatically monitored.
This is accomplished without polling by:
 - Waiting for changes in the package registry
 - Checking the list of developer apps from the Appx manager
 - Waiting for changes in the application's shader directory

Without polling, the service has 0% CPU utilization when idle, regardless
of the number of Appx packages monitored. This is compared to Xap devices,
which may incur several fractions of a percent of CPU time during
package polling.

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

This prevents winrtrunner from hanging when the app quits too quickly
to identify the state.

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

... when the license is expired. The installation can then continue.

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

A non-categorized logging call slipped through the cracks.

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

This argument is apparently a typo in the MSDN docs. It is not
documented and not present in assembly of actual users of this API.
This change corrects all the users of the API in qttools.

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

This adds control over the logging level, as done in related tools
winrtrunner and windeployqt.

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

For emulator operations, exit the current worker thread if the emulator
does not appear to be running.

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

When installing the service, administrative privileges are required, and
the service user must be the logged-on user. This adds a self-elevation
routine to the install/remove options, and requests the user's credentials
using the native credentials UI.

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

This adds event triggers which allow for detecting when a device or
emulator is activated. When a device comes online, it is checked for
applications, and workers are created to monitor each application.

This changes the behavior for device connections. Instead of retrying the
connection repeatedly for 30 seconds, the worker returns after the first
failure. This is acceptable, because the worker will automatically be
reactivated when the device comes online.

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

This is useful for logging purposes, particularly in service mode where
it is not possible to redirect the output.

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

Fix a number of bad error messages and make the formatting more
consistent. Also correct the error ID structure that gets passed to the
event log.

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

This moves qtd3dservice from a shared process to its own process. This
is required to fix problems with accessing the emulators from multiple
threads and to run qtd3dservice as the logged-on user.

- The service process which provides a thread for each worker, and can
  add and remove workers as needed.
- The same threading model is used in service and direct modes to
  reduce complexity and behavioral differences between modes.
- Device handlers can be quit from the main thread by setting their
  run lock event.

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

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

Change-Id: I5f1f3774ac81ea61406c6ef964fd189051ebe994
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

There is a bug in "adb push" which makes it fail when the input
directory ends with a slash on Windows. This made it impossible
to use the debug deployment method on Windows.

[ChangeLog][Android][androiddeployqt] Fixed debug deployment on
Windows.

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

If --debug or --release is used, findDependentQtLibraries should not
change the isDebug value, so another variable was introduced.
"detectedDebug" gives information about the detected debug state of
the executable/library but this value might be ignored if --debug
or --release was used.

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

It isn't really useful unless your target is WinRT, in which case you
can build winrtrunner with that version of Qt.

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

Features declared by Qt modules are not necessarily used by
an app, so we mark them as unrequired. It's the responsibility
of the developer to mark them as required if needed.

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

The feature is present in MSVC 2008 onwards. Fixes warnings when
compiling with 32bit:

main.cpp(97) : warning C4341: 'QtWebKitWidgetsModule' : signed value is out of range for enum constant

Change-Id: I955c5c9f1ed6f1e94c95294e191cc36c5b668391
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

To speed up listing files from assets, we pregenerate a file
list which can be used to prepopulate the cache in the
assets file engine.

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

524375bc attempted to fix multithreaded access with a mutex, but that
was not enough to handle access before the server was fully constructed.
This partially reverts 524375bc

 and puts the initialization code into
a separate function which can be checked to make sure the server is
fully constructed before proceeding.

The Q_DECLARE_PRIVATE macro is added for clarity and const-correctness.

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

If waiting for the app to terminate, consider the app still running if
it is suspending/suspended. Only stop when the app enters the
terminated state.

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

Added missing connect call in XapEngine::stop.

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

Some HRESULTs use 0x973 as the origin, so adding that to the error
formatter corrects some error messages that would otherwise come across
as "??".

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

The -qdevel argument allows winrtrunner to get the PID of the running
application. If winrtrunner builds a package, it might as well have
-qdevel in the arg list, because winrtrunner is likely to run it. The
extra arg shouldn't affect normal applications and won't be present in
packages built for the Windows Store anyway.

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

The server may be used from several threads at once during startup, so
use a mutex to protect initialization and enumeration of devices.

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

This is a utility for monitoring and deploying D3D shader blobs
requested by d3dcompiler_qt. It is designed as an on-demand service that
runs while it is needed. It must be started manually via netsvc.

The service may be started from the command line using the -direct
option, or installed as a Windows service by passing the -install option.
After it has been installed, one can use net start/stop to control the
service.

The service supports monitoring applications on the local machine or
remote devices. To register an application for monitoring, call
qtd3dservice -register <device_id>:<application_id>. The device ID can be
an index, or the full device string name. For the local machine, use
"local" or omit the device name. The application ID is the the product
ID for XAP packages, or the package full name for Appx packages.

An application can be removed from the monitor by passing -unregister with
the same arguments as register.

A list of registered applications can be retrieved with qtd3dservice -list.

When the service is started, all registered applications will be monitored.
If the device is disconnected, the service will try to connect for up to
30 seconds before giving up. Once the service has given up, it must be
restarted (using net start). Therefore, it is important that "net start
qtd3dservice" is configured as a deployment step.

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

In case of an x64 environment phone devices cannot be listed, but
winrtrunner should not crash in this case.

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