Andrew Knight [Mon, 3 Mar 2014 11:12:02 +0000 (13:12 +0200)]
qtd3dservice: Add verbosity option
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>
Andrew Knight [Mon, 3 Mar 2014 10:37:18 +0000 (12:37 +0200)]
qtd3dservice: Don't continue if XDE isn't running
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>
Andrew Knight [Mon, 3 Mar 2014 10:33:33 +0000 (12:33 +0200)]
qtd3dservice: Add self-elevation and credentials request
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>
Andrew Knight [Tue, 4 Mar 2014 11:47:17 +0000 (13:47 +0200)]
qtd3dservice: Add triggers for Windows Phone devices and emulators
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>
Andrew Knight [Mon, 3 Mar 2014 08:54:18 +0000 (10:54 +0200)]
qtd3dservice: Add output file option
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>
Andrew Knight [Mon, 3 Mar 2014 08:49:05 +0000 (10:49 +0200)]
qtd3dservice: Improve error messaging
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>
Andrew Knight [Mon, 3 Mar 2014 08:40:58 +0000 (10:40 +0200)]
qtd3dservice: Restructure handling for service mode
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>
Sergio Ahumada [Sun, 2 Mar 2014 10:48:02 +0000 (11:48 +0100)]
Prefer to use normalised signal/slot signatures
Change-Id: I87fc653492fb5857d5ddcffad4cf762eacb5f364
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Oliver Wolff [Fri, 28 Feb 2014 11:19:55 +0000 (12:19 +0100)]
Assistant: Fixed build for QT_NO_CURSOR
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>
Eskil Abrahamsen Blomfeldt [Thu, 27 Feb 2014 11:21:00 +0000 (12:21 +0100)]
androiddeployqt: Fix debug deployment on Windows
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>
Oliver Wolff [Thu, 27 Feb 2014 10:29:12 +0000 (11:29 +0100)]
windeployqt: Fixed --debug and --release together with --qmldir
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>
Andrew Knight [Tue, 25 Feb 2014 11:34:16 +0000 (13:34 +0200)]
Don't build winrtrunner on other platforms than WinRT
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>
Yoann Lopes [Thu, 20 Feb 2014 15:59:19 +0000 (16:59 +0100)]
androiddeployqt: always declare features as unrequired.
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>
Friedemann Kleint [Fri, 21 Feb 2014 09:26:07 +0000 (10:26 +0100)]
windeployqt: Enable module enumeration type for all MSVC.
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>
Eskil Abrahamsen Blomfeldt [Thu, 30 Jan 2014 13:33:46 +0000 (14:33 +0100)]
androiddeployqt: Pregenerate file list for assets
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>
Andrew Knight [Thu, 20 Feb 2014 10:02:08 +0000 (12:02 +0200)]
qtd3dservice: Check that CoreCon is initialized with exists()
524375b 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 524375b 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>
Andrew Knight [Thu, 20 Feb 2014 17:23:00 +0000 (19:23 +0200)]
winrtrunner: Stay attached until the app is terminated
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>
Joerg Bornemann [Tue, 18 Feb 2014 10:41:47 +0000 (11:41 +0100)]
fix stop command for Xap profile
Added missing connect call in XapEngine::stop.
Change-Id: I08ab5f63d65daded335d56d74a7fa835de2558e4
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Andrew Knight [Wed, 19 Feb 2014 09:26:24 +0000 (11:26 +0200)]
CoreCon: fix message output
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>
Andrew Knight [Wed, 19 Feb 2014 11:17:04 +0000 (13:17 +0200)]
winrtrunner: Always add -qdevel to phone install args
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>
Andrew Knight [Mon, 17 Feb 2014 08:10:24 +0000 (10:10 +0200)]
CoreCon Server: guard with a QMutex
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>
Andrew Knight [Fri, 14 Feb 2014 09:35:17 +0000 (11:35 +0200)]
Introducing Qt D3D Compiler service
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>
Oliver Wolff [Fri, 14 Feb 2014 08:22:24 +0000 (09:22 +0100)]
WinRTRunner: Fixed access violation when listing phone devices
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>
Andrew Knight [Fri, 14 Feb 2014 07:40:37 +0000 (09:40 +0200)]
winrtrunner: CoreCon builds with x64, so let it
The phone portions may not initialize on x64, but we can still let them
build.
Change-Id: I60f886a0662772547778a7130422104283fd39a1
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Frederik Gladhorn [Thu, 13 Feb 2014 11:14:57 +0000 (12:14 +0100)]
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Andrew Knight [Wed, 12 Feb 2014 08:12:42 +0000 (10:12 +0200)]
Windows Phone backend for winrtrunner
Adds Windows Phone deployment support to winrtrunner. Access to Windows
Phone devices is provided by the CoreCon API, a set of COM interfaces
which are registered when installing the Windows Phone SDK.
Change-Id: Iff2b2128e3925e6676697e81750c8060e1b8072d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Andrew Knight [Wed, 12 Feb 2014 14:34:47 +0000 (16:34 +0200)]
Introducing winrtrunner
winrtrunner is a console application for launching WinRT Qt packages. It
handles:
- installing (registering) & removing the package
- launching & terminating the app
- fetching & dispaying test output for test cases
It is designed to compile everywhere, as the platform-specific backends
are left out where not supported. Currently it only has a backend for
Appx packages, so MSVC2012/2013 is required. It may support other
backends over time, such as Windows Phone and remote Appx, as well as
any host SDK that gains support for deploying to these platforms.
Done-with: Maurice Kalinowski <maurice.kalinowski@digia.com>
Change-Id: I424c228435d8eb4608a1d1854106b9df69ca5f11
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Frederik Gladhorn [Wed, 12 Feb 2014 13:11:51 +0000 (14:11 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I70d45044c3dcb1e4da7ed9da377b77e6c0f9442b
Mitch Curtis [Fri, 7 Feb 2014 16:44:15 +0000 (17:44 +0100)]
Document how to use windeployqt.
Change-Id: Iabc27ad9adb5597904c3d03a732c8fa84336f55c
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Frederik Gladhorn [Thu, 6 Feb 2014 11:42:00 +0000 (12:42 +0100)]
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Maurice Kalinowski [Fri, 24 Jan 2014 10:24:46 +0000 (11:24 +0100)]
Compile fix for WinRT
Change-Id: I836f33a231764efc341db4b35fbed46c94d92df0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Frederik Gladhorn [Mon, 3 Feb 2014 16:28:28 +0000 (17:28 +0100)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I6d8fce7daab4dcfc9ffc93543dd0a1337a3f3c9d
Bastiaan Veelo [Sat, 16 Nov 2013 20:48:49 +0000 (21:48 +0100)]
Assistant: Load all applicationIcon pixmaps.
Qt Assistant, when used as a custom help viewer, would not load all
sizes of the application icon specified in the .qhcp file. Now
application icons look good everywhere, provided the files contain
multiple icons of various sizes.
Task-number: QTBUG-28267
Change-Id: I362e2feafa7944b0ad25627fb2fcea1b90af4e53
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Kai Koehne [Wed, 29 Jan 2014 13:49:32 +0000 (14:49 +0100)]
Replace win32-g++ with mingw scope
Commit 773dd01 in qtbase introduced a general mingw platform scope, which
is cleaner and more flexible than matching the spec name.
(see
278152fff for a similar commit in qtbase).
Change-Id: Ia374dd565469750efed2b537e48c651fc3af8cb5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Kai Koehne [Wed, 29 Jan 2014 13:48:33 +0000 (14:48 +0100)]
Simplify logic for C++ exception support
exception.prf takes care of all of this.
Change-Id: I6d8ba116a425eecf94557bdd682ca58905e6263a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
BogDan Vatra [Mon, 27 Jan 2014 16:04:01 +0000 (18:04 +0200)]
Remove all locallibs with unmet dependencies.
Change-Id: I871aaa2488f2df0d6af5f51b3a37bc0e8bc8a1c3
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
BogDan Vatra [Thu, 30 Jan 2014 08:45:43 +0000 (10:45 +0200)]
Fix the use of opengl for Qt 5.3.
Starting with Qt 5.3 there is only one platform plugin.
Change-Id: If0e88c8662c88b23fa2b714796684846e7c066ba
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
BogDan Vatra [Mon, 27 Jan 2014 10:14:51 +0000 (12:14 +0200)]
Fix indentation
Change-Id: I487cfd4fde5f77174ce4a0fc7bed7c75cb0ecebd
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
BogDan Vatra [Mon, 27 Jan 2014 10:14:26 +0000 (12:14 +0200)]
Write pretty AndroidManifest.xml
Change-Id: I11d09940d28f13f1e1d9939ee46e2c321d8cb2a9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
BogDan Vatra [Mon, 27 Jan 2014 10:14:10 +0000 (12:14 +0200)]
Fix warning
Change-Id: I88086a60209b399d43cab1dc68f564878fd7b51f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Joerg Bornemann [Wed, 22 Jan 2014 14:32:53 +0000 (15:32 +0100)]
make the MinGW build of lupdate work for non-admin users
Windows User Access Control thinks that lupdate is an installer,
because of the string "update" in the executable name.
MSVC automatically creates and embeds a manifest into the executable
to state that lupdate doesn't need admin rights.
For MinGW we now embed a handcrafted manifest.
[ChangeLog][lupdate] Fixed lupdate requiring admin rights when built
with MinGW.
Task-number: QTBUG-36369
Change-Id: I306ba4c13014f2e39fc5785bb90bacd951726ad4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Fri, 24 Jan 2014 12:35:51 +0000 (13:35 +0100)]
Linguist: Fix MSVC-warnings about double truncation.
messageeditor.cpp:941: warning: C4305: '*=' : truncation from 'double' to 'float'
Change-Id: I1ddf5a9cc6aefaab1d62c33cc95955d981ea5fb9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Eskil Abrahamsen Blomfeldt [Wed, 22 Jan 2014 09:17:33 +0000 (10:17 +0100)]
androiddeployqt: Support spaces in jarsigner arguments
The input to the jarsigner (specifically the password, alias,
file name, etc.) can contain spaces, so the arguments need
to be quoted.
[ChangeLog][Android][androiddeployqt] Fixed signing packages
using arguments containing spaces.
Task-number: QTBUG-36327
Change-Id: Ie673ab91da4ffe074851a6ddef96efbb7657636b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Thiago Macieira [Wed, 22 Jan 2014 21:06:08 +0000 (13:06 -0800)]
Update changelog for 5.2.1
Change-Id: I16ff3a410898563857b70d467f6ba8599c722ce6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Kai Koehne [Mon, 27 Jan 2014 15:43:40 +0000 (16:43 +0100)]
Fix crashes in QtHelp when too many connections are made
Fixes a crash when Qt Creator was registering a large number of .qch
files on first startup: In this case the limit of 1000 connections
within one session will overflow, resulting in conflicting connection
names and crashes later on.
Remove this limitation by keeping separate counters per connection name,
and also not wrapping around after 1000.
It's not clear where the 1000 connection limit stems from: The offending
lines predate the first git import of Qt 4.
Task-number: QTBUG-36480
Change-Id: If00276652644efa854a75407d00ba01069bde02a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Frederik Gladhorn [Mon, 27 Jan 2014 17:55:30 +0000 (18:55 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I970feea253fde4e03bb7a62583080402b2043189
Daniel Teske [Thu, 23 Jan 2014 12:00:49 +0000 (13:00 +0100)]
Android: Package names aren't allowed to start with a '_'
Apparently that doesn't work.
Task-number: QTCREATORBUG-11319
Change-Id: If97f0bc5c49e99dac42ec3c539f5ba4b2f060bec
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Laszlo Agocs [Fri, 24 Jan 2014 11:00:59 +0000 (12:00 +0100)]
kmap2qmap: Generate code with the proper class names
Change-Id: I91776274baa4efddd1864acac31a3dd44768e159
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Laszlo Agocs [Fri, 24 Jan 2014 10:55:23 +0000 (11:55 +0100)]
kmap2qmap: Remove unused variable
Change-Id: I4bfe54b90e187e7b70bb8f2b4abd64b04a378b6e
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Erik Larsson [Mon, 16 Dec 2013 12:16:40 +0000 (13:16 +0100)]
Add font size storage/unified handling in Linguists editors
Add a unified font size handling in Linguists editors by assigning
Ctrl-+/Ctrl--/Ctrl-Wheel to inc/dec font size of ALL editors. The
current font size is also stored in the configuration and set at next
startup. This is done to make it simpler to use for translators.
If the configuration does not have a font size set it will set the
default system size.
Change-Id: I941f07807653360f8518938380f2c6a2d6f08b63
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Erik Larsson [Sun, 15 Dec 2013 15:19:59 +0000 (16:19 +0100)]
Add action to toggle ‘visualize whitespaces’ in editors
Add action, in ‘View’, that lets the user toggle the whitespace markers
in editors. Whitespace markers are the small dots/arrows etc. marking
spaces, tabs and new-lines. To some translators this can make it hard
to see the text, hence the reason for making it possible to toggle.
Change-Id: I484b51b078c84dacc1fe534b935dd9f8ce12de42
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Erik Larsson [Thu, 19 Dec 2013 21:54:18 +0000 (22:54 +0100)]
Make developer comment copyable for clipboard
Make developer comment text copyable even when not editable. This
will make it behave just like source text does during clipboard copy.
Change-Id: I1672a41acbe3c9c92e7b9766cd81db4b0463caea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Wed, 22 Jan 2014 10:36:01 +0000 (11:36 +0100)]
windeployqt: Add options to override debug/release detection.
Task-number: QTBUG-36347
Change-Id: I6cad9f7b699a442476698819d5608f572687c39b
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Frederik Gladhorn [Wed, 22 Jan 2014 10:37:35 +0000 (11:37 +0100)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I93127fc2b9963d0fec1ca7180cfa2c110bf3d27d
Oswald Buddenhagen [Fri, 17 Jan 2014 19:14:07 +0000 (20:14 +0100)]
whitespace fixes
remove trailing spaces & expand tabs
Change-Id: If9909c94b52d9dacb7c8735470525d18a1c97d6b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Frederik Gladhorn [Fri, 17 Jan 2014 16:27:37 +0000 (17:27 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I44d12139aef2988cf7ec6c22129f105b597b6d54
Sergio Ahumada [Wed, 15 Jan 2014 22:00:16 +0000 (23:00 +0100)]
Bump MODULE_VERSION to 5.2.2
Change-Id: I4630da5ae21133dd72d27d4354ed165116b26675
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Kalle Viironen [Thu, 16 Jan 2014 08:06:27 +0000 (10:06 +0200)]
Remove checking of old product that doesn't exist anymore
There's no product called 'console' anymore.
Change-Id: I57e1173de388f3602a392c1a38019ff20179e06a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Kalle Viironen [Wed, 15 Jan 2014 11:14:02 +0000 (13:14 +0200)]
Remove conditions that aren't used anymore
QT_EDITION and QT_MODULE_GRAPHICSVIEW aren't used anymore.
Change-Id: I73d78a79ce7ca6bb4ab240d49ac0bd749a9ecdb4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Oswald Buddenhagen [Mon, 16 Dec 2013 13:25:55 +0000 (14:25 +0100)]
do not look for mkspecs/ directories in project trees
this pretty surprising behavior would interfere with building the
examples from an installed qt tree with qmakes from other qt builds.
.qmake.conf (and .qmake.cache) files provide a possibility to explicitly
"anchor" project roots, so there is no point in having a second, even
more magic way to do it.
Task-number: QTBUG-35485
Change-Id: I8fd4fda67cabafdf55e7a98282dcdfaffb4a405e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
(cherry picked from qtbase/
65a676372c533e8b35117081ec0aa1a94e1500e5)
Reviewed-by: hjk <hjk121@nokiamail.com>
Oswald Buddenhagen [Fri, 15 Nov 2013 18:28:50 +0000 (19:28 +0100)]
don't turn = into += in cumulative mode
it leads to pathological cases where the number of loop iterations may
go way beyond the reasonable.
this means that users need to avoid using the = operator in alternative
branches that lead to different sources/subdirectories being included
into the project. this is a bit of a corner case anyway, as people
usually add directly to SOURCES/SUBDIRS.
Change-Id: I7783e318fbc2790f6a853ba4e3f4a12db881feb5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtcreator/
30bd7fcce1aef974f6af9eaa6532aa1f2b6192d2)
Oswald Buddenhagen [Fri, 15 Nov 2013 13:36:02 +0000 (14:36 +0100)]
set QMAKE_INTERNAL_INCLUDED_FILES even without PROEVALUATOR_FULL
some qt prfs use this variable, so better set it it to avoid some noise.
Change-Id: I606c88dd7664b1cd8b490d60badd5c6bf80fd1c9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtcreator/
e64cc71194cbe283dfe9bd2cd688f01fcdcadf34)
Friedemann Kleint [Tue, 14 Jan 2014 15:37:47 +0000 (16:37 +0100)]
Revert "Qt Designer: Fix scrolling of widget box."
This reverts commit
082efca145630db2d660d7241f7ae78d80f27e44.
Following the revert of
934f06220391eb0e0ebf66a2eb037f48adb4c43c
in qtbase.
Task-number: QTBUG-34953
Task-number: QTBUG-33906
Change-Id: Ib839ef4a3b43e136ab1ff298606d5b2945b2a51b
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Eskil Abrahamsen Blomfeldt [Thu, 2 Jan 2014 11:46:26 +0000 (12:46 +0100)]
androiddeployqt: Always overwrite user files
The Android files in the project should always overwrite the
equivalents in the template, even if the template files have
been modified after the project files. Otherwise an old project
could stop working when Qt was updated.
Task-number: QTBUG-35147
[ChangeLog][Android][QTBUG-35147] Make sure Android files in the
project always overwrite the equivalent files in the project
template.
Change-Id: I4c38061501cbcaa1061e376e7b49a1a0efe596cf
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Friedemann Kleint [Fri, 10 Jan 2014 11:44:46 +0000 (12:44 +0100)]
windeployqt: Support delay-load linked DLLs.
Task-number: QTBUG-35810
Change-Id: I10f5ff742d5abe0185c8046f2a4e473740611231
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Friedemann Kleint [Mon, 13 Jan 2014 11:17:25 +0000 (12:17 +0100)]
windeployqt: Fix help formatting.
Bluetooth is the first module.
Change-Id: I69f3dda65c4f98978e7c9232127a7949e7f45e66
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Friedemann Kleint [Mon, 13 Jan 2014 12:38:01 +0000 (13:38 +0100)]
windeployqt: Use standard streams.
Change-Id: I9c91cb6fef0bfee5c3ab018ae04353022c8e7f33
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Frederik Gladhorn [Fri, 10 Jan 2014 17:31:41 +0000 (18:31 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0ddb08a2fff6bd0da01e14726f2789741b509e76
Tasuku Suzuki [Sat, 21 Dec 2013 07:15:32 +0000 (16:15 +0900)]
add "Clear" to context menu of log viewer in qdbusviewer
Change-Id: Id4da5fcfdbe462e22a4227699c3e13ecf0cd363a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Tasuku Suzuki [Sat, 21 Dec 2013 05:01:41 +0000 (14:01 +0900)]
assign a shortcut key to the Quit action in qdbusviewer
Change-Id: I5c1f99741ba203c0fc405d49df51357ebf52e199
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
kh1 [Thu, 9 Jan 2014 07:56:43 +0000 (08:56 +0100)]
Assistant: Introduce a 'compact' display for the simple search
Setting the mode disables the Previous and Next buttons for the simple
search history. This is meant to be used e.g. in Qt Creator where the
horizontal space in the side bar is precious.
Change-Id: If13ffbf2656c471ceb10c5bb15e39166fedbcb85
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Andrew Knight [Wed, 8 Jan 2014 14:34:34 +0000 (16:34 +0200)]
windeployqt: add a -dry-run option to simulate deployment
For some use cases, only output (not deployment) may be required. This
adds an option to only simulate deployment, without copying any files.
Change-Id: I5ed6fcfd802255f6c8d9091f547a1b64a4a614e5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Oswald Buddenhagen [Tue, 10 Dec 2013 20:57:13 +0000 (21:57 +0100)]
don't pretend that the tr functions are language tokens
this avoids misparsing in a few contexts where a respective identifier
was not meant to be a tr()/etc. function call (e.g., class/namespace),
and it's more efficient, because we don't try to map every single word
to a function token any more.
Change-Id: I2b424a34a70e427dde9b2d28a9f8517f53852d83
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Tue, 10 Dec 2013 20:54:23 +0000 (21:54 +0100)]
dissolve getMacroArgs() function
the replacement is less efficient, but also less obscure and more
robust.
Change-Id: Iee0538b5515c01116a4227f35d52f8166f1c730d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 4 Dec 2013 21:04:08 +0000 (22:04 +0100)]
don't reset yyWord right away
there is no point in doing that - all tokens that actually "fill" the
word, calculate the size "from scratch" anyway.
not resetting it potentially allows us to use the word after reading
further tokens. though comments between the tokens would mess things up
...
Change-Id: I27f16444a0a94e3abb37dcf15f2cc788ebe63c7c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 4 Dec 2013 20:33:06 +0000 (21:33 +0100)]
factor Tok_tr* handlers into functions
Change-Id: I823da75d436c07b9abe85054cf3e9f4c86a5e8fe
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 4 Dec 2013 19:35:16 +0000 (20:35 +0100)]
reserve space for joined string in stringifyNamespace()
Change-Id: Idc1aea8e98dcf56729e115757d0b133a9a4636bd
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 4 Dec 2013 19:26:56 +0000 (20:26 +0100)]
don't convert unresolved namespace parts to a string list
instead, convert it into the final string directly.
Change-Id: Ibae86bf8da0bc926d26b4d1d98ccd5cfa3e7f06f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 4 Dec 2013 18:40:47 +0000 (19:40 +0100)]
prefer stable reference into container
this currently does not matter, as we are using a container which
allocates each element separately, but this may change at some point.
also, it's just cleaner this way.
Change-Id: Idf814e0fa70bb33f49d8afd901517e3d096a80fc
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 4 Dec 2013 18:25:55 +0000 (19:25 +0100)]
use NamespaceList more consistently
as we use HashString for the segments in *qualify*(), we should use the
respective typedef'd container.
Change-Id: I21e986bac951b45e556a425d0eaba4e2a736e9cf
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 4 Dec 2013 18:13:41 +0000 (19:13 +0100)]
don't create temporary string lists and concatenate them
this is most certainly slower than creating (short) temporary strings
and concatenating them.
Change-Id: I679cd64310c42a8daeeccbcfd782e591e9fa0ba6
Reviewed-by: hjk <hjk121@nokiamail.com>
Oswald Buddenhagen [Fri, 15 Nov 2013 16:43:14 +0000 (17:43 +0100)]
remove dead code
there is no use for a "default context" any more.
amends
17af244af.
Change-Id: I85122e4813668cffe9fa65baf2688c53e7b79989
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 27 Nov 2013 20:34:02 +0000 (21:34 +0100)]
make function alias manager QString-based
the parsers are all QString-based, so using byte arrays just slows down
things unnecessarily.
Change-Id: I5f83a21382250d5af74d5eaa9a2aab4cb57c4407
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 27 Nov 2013 20:08:03 +0000 (21:08 +0100)]
stricter enum typing
helps with debugging, and is just better.
Change-Id: I8364fad374dc0a50a00388219f1b1a911f98e868
Reviewed-by: hjk <hjk121@nokiamail.com>
Frederik Gladhorn [Mon, 6 Jan 2014 16:14:48 +0000 (17:14 +0100)]
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Frederik Gladhorn [Mon, 6 Jan 2014 15:30:57 +0000 (16:30 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I5722759d15676448eb976bfbd908d9cd5eb2650f
Andrew Knight [Wed, 1 Jan 2014 21:43:44 +0000 (23:43 +0200)]
windeployqt: Add a list mode which is suitable for an Appx mapping file
This is useful for creating Appx packages of WinRT projects.
Task-number: QTBUG-35599
Change-Id: I7cbca82377361709d87b705d7b4dd7a57c1641b3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Andrew Knight [Mon, 30 Dec 2013 10:58:11 +0000 (12:58 +0200)]
windeployqt: Add output options for simple lists
Some tools, such as MSBuild, can't parse JSON easily. This change adds
a "list" option, which changes the output to list the deployed files, one
per line. The user can view the source, target, or relative target files
by passing -line <source|target|relative> to windeployqt.
Task-number: QTBUG-35328
Change-Id: I8181ea4f230e7e2b146a5019934ae5fbe768bcec
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
BogDan Vatra [Sat, 28 Dec 2013 15:16:09 +0000 (17:16 +0200)]
Print adb commands in verbose mode.
Change-Id: I3b779f82ef5b4b474eda9e6f2911a7bf46b8c87d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
BogDan Vatra [Sat, 28 Dec 2013 15:11:28 +0000 (17:11 +0200)]
Remove old qt libs if the qt installation folder is different.
Store and check the Qt instalattion folder.
Change-Id: I7a890da82d5b7a4ae467d157daa7c4e41b15a11b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Frederik Gladhorn [Mon, 23 Dec 2013 14:37:49 +0000 (15:37 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I788baca1c05b6293c295f7842347bf0100d9d48c
Eskil Abrahamsen Blomfeldt [Thu, 5 Dec 2013 09:15:18 +0000 (10:15 +0100)]
androiddeployqt: Speed up debug deployment
Debug deployment had a major flaw which made it slower than
just bundling the libraries. For every deployment it would
recursively extract the timestamp of all files from the
remote tmp/ directory. This took about 20 seconds.
I've made some improvements:
1. Just use a single modification.txt file which is updated for every
deployment and only update Qt files that have changed since the last
deployment.
2. Deploy all Qt files in debug deployment instead of just the
dependencies of the app, to make it possible to add dependencies to
the app at a later time without clearing the remote cache.
3. Instead of doing an adb push call for each file, we now just do one
big push after building the local temporary directory.
4. I added a timing mechanism to make it simpler to debug problems
related to this.
Task-number: QTBUG-35401
[ChangeLog][androiddeployqt][QTBUG-35401] Speed up debug deployment.
Change-Id: Ida94c73fc48a0a627203398a86732a94baff1451
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Harald Fernengel [Fri, 13 Dec 2013 09:59:03 +0000 (10:59 +0100)]
Better error message if dbus libs unavailable
If the D-Bus libraries cannot be loaded, the DBusConnection would
have a null d-pointer, thus have no QDBusError.
Change-Id: Ibeca6eae84c84c886c173817c9c83e76d45346a0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Friedemann Kleint [Tue, 17 Dec 2013 16:18:20 +0000 (17:18 +0100)]
windeployqt: Fix deployment of the D3D compilers.
Don't deploy system D3D compilers on Windows Phone and
introduce option to turn it off.
Deploy d3dcompiler_qt for Qt versions >= 5.3 should it exist.
Add code to determine the Qt version number (for which qmake does
not write a newline character).
Task-number: QTBUG-35597
Change-Id: Ic42954959b447d8fe0bd0adff064df6711992529
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Friedemann Kleint [Tue, 17 Dec 2013 10:23:42 +0000 (11:23 +0100)]
Qt Designer: Clear undo stack when reloading form.
Task-number: QTCREATORBUG-11119
Change-Id: I4ad9a4ac16f17fec292264896b82f881a4ca5a7d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Friedemann Kleint [Tue, 17 Dec 2013 15:50:11 +0000 (16:50 +0100)]
windeployqt: Copy .qml files as well.
Change-Id: I8bf115a87bfa6e67e04d17c628a3efc55ef7413e
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Friedemann Kleint [Tue, 17 Dec 2013 15:46:00 +0000 (16:46 +0100)]
windeployqt: Copy QML directory structure correctly.
Introduce a Module struct to QmlImportScanResult from which
the relative/absolute install path can be derived (similar
to macdeployqt).
Task-number: QTBUG-35638
Change-Id: Ief69779f4ea8659b346bf364ec748cfe78eb6728
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Mitch Curtis [Tue, 17 Dec 2013 11:07:36 +0000 (12:07 +0100)]
Fix typo in macchangeqt help.
Task-number: QTBUG-34783
Change-Id: I8f6ff878e900f9684c5dd595fbc720d0a7d82330
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Friedemann Kleint [Mon, 16 Dec 2013 16:50:02 +0000 (17:50 +0100)]
windeployqt: Fix scanning of QML-plugins.
Task-number: QTBUG-35637
Change-Id: I0f5a3df3b9be83f3d153135bbca168bfc9005696
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Frederik Gladhorn [Mon, 16 Dec 2013 15:23:13 +0000 (16:23 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I9d12d13a40f0514410dc5e660cabd89152cfc6c6