Friedemann Kleint [Fri, 9 May 2014 08:49:48 +0000 (10:49 +0200)]
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>
Thiago Macieira [Thu, 1 May 2014 21:04:23 +0000 (14:04 -0700)]
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>
Thiago Macieira [Thu, 1 May 2014 21:04:03 +0000 (14:04 -0700)]
Print the password character using the form U+XXXX
Change-Id: I5d901e6471509cb0f5177724d94912becf258182
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Thiago Macieira [Thu, 1 May 2014 21:03:04 +0000 (14:03 -0700)]
Explain what the * are in qtdiag's output or remove them
Change-Id: Ie5c43c88d51d282bde4e1d91e86b95e4e5c4e91f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Thiago Macieira [Thu, 1 May 2014 20:59:11 +0000 (13:59 -0700)]
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>
Friedemann Kleint [Mon, 28 Apr 2014 12:07:51 +0000 (14:07 +0200)]
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>
Eskil Abrahamsen Blomfeldt [Mon, 28 Apr 2014 12:52:03 +0000 (14:52 +0200)]
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>
Frederik Gladhorn [Thu, 1 May 2014 10:47:49 +0000 (12:47 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I311a5d7b5177dd0cea49ed2d4d9125b27d3ba5e0
Yuchen Deng [Sat, 26 Apr 2014 13:48:27 +0000 (21:48 +0800)]
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>
Laszlo Agocs [Sun, 27 Apr 2014 19:54:14 +0000 (21:54 +0200)]
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>
Jani Heikkinen [Fri, 25 Apr 2014 07:39:01 +0000 (09:39 +0200)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Friedemann Kleint [Thu, 24 Apr 2014 13:16:56 +0000 (15:16 +0200)]
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>
Sergio Ahumada [Thu, 17 Apr 2014 15:31:20 +0000 (17:31 +0200)]
Bump MODULE_VERSION to 5.3.1
Change-Id: I49f696c528ec631cdc5aac2dc3f0402646a14de0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Jani Heikkinen [Wed, 23 Apr 2014 09:46:44 +0000 (12:46 +0300)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: If733be66da6ef6b1e28ec6ba180beafea6c9990d
Tor Arne Vestbø [Tue, 22 Apr 2014 13:14:52 +0000 (15:14 +0200)]
Skip qtpaths on iOS
Change-Id: Ie31615c62d228d23fab8d8eb5bcbcaf80957403e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Friedemann Kleint [Thu, 17 Apr 2014 11:28:35 +0000 (13:28 +0200)]
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>
Stephen Kelly [Wed, 16 Apr 2014 10:33:54 +0000 (12:33 +0200)]
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>
Stephen Kelly [Wed, 16 Apr 2014 10:24:28 +0000 (12:24 +0200)]
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>
Stephen Kelly [Wed, 16 Apr 2014 11:40:21 +0000 (13:40 +0200)]
CMake: Check that executables in the linguist package exist before use.
Change-Id: Ifaaff157a836e3ebfb94b563631b65a226ed0d8c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Wed, 16 Apr 2014 10:02:41 +0000 (12:02 +0200)]
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>
Eskil Abrahamsen Blomfeldt [Fri, 11 Apr 2014 09:48:15 +0000 (11:48 +0200)]
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>
Kai Koehne [Thu, 10 Apr 2014 07:47:00 +0000 (09:47 +0200)]
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>
Kai Koehne [Thu, 3 Apr 2014 13:55:16 +0000 (15:55 +0200)]
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>
Luigi Toscano [Mon, 31 Mar 2014 22:11:42 +0000 (00:11 +0200)]
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>
Friedemann Kleint [Wed, 9 Apr 2014 06:28:37 +0000 (08:28 +0200)]
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>
Andrew Knight [Thu, 27 Mar 2014 13:58:47 +0000 (15:58 +0200)]
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>
Oswald Buddenhagen [Fri, 4 Apr 2014 16:29:05 +0000 (18:29 +0200)]
make QtDesigner claim plugins of type 'designer'
Change-Id: I76c0628551cef19719c73d84ad69b94db43064c7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Friedemann Kleint [Mon, 7 Apr 2014 07:28:35 +0000 (09:28 +0200)]
Remove GLES1 switch branch from qtdiag.
GLES1 was removed by
qtbase
a4ec90175c76ce35688acc06cdf93e9cab886223 .
Change-Id: I6d07ac6e2f2e51c41876dc383aef77ce57f76128
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Friedemann Kleint [Mon, 31 Mar 2014 14:34:27 +0000 (16:34 +0200)]
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>
Andrew Knight [Mon, 31 Mar 2014 14:35:26 +0000 (17:35 +0300)]
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>
Andrew Knight [Tue, 1 Apr 2014 08:39:07 +0000 (11:39 +0300)]
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>
Andrew Knight [Thu, 27 Mar 2014 08:04:17 +0000 (10:04 +0200)]
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>
Oliver Wolff [Fri, 28 Mar 2014 14:11:03 +0000 (15:11 +0100)]
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>
Maurice Kalinowski [Mon, 31 Mar 2014 13:36:38 +0000 (15:36 +0200)]
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>
Friedemann Kleint [Fri, 28 Mar 2014 13:13:06 +0000 (14:13 +0100)]
Fix dependencies in Qt Designer, Qt Linguist documentation.
Change-Id: I4cb3086a998112c035733c447a3687fc4441887b
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Friedemann Kleint [Wed, 26 Mar 2014 10:27:37 +0000 (11:27 +0100)]
Fix some documentation errors.
Change-Id: I1aa99b483c1cc4accba185bfdee12397af617e50
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Morten Johan Sørvig [Mon, 24 Mar 2014 08:18:35 +0000 (09:18 +0100)]
MacDeployQt: Add -always-overwrite option.
Support incrementally re-deploying to an existing app
bundle. Overwrite files that already exist in the
bundle. Disable the "Can not find Qt" warning. Skip
plugin deployment if Qt can not be found.
Remove usages of the Qt4-style binary packages from
/Developer.
Task-number: QTBUG-36043
Change-Id: I11d1e36e6beef24b55979fc4d853e19b60551740
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Daniel Molkentin [Mon, 24 Mar 2014 20:38:11 +0000 (21:38 +0100)]
cmake: Do not add .exe postfix for linguist tools in cross-compile situations
Change-Id: I3696d4f6bb237f9bee15f86ef68cce48ee388942
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Friedemann Kleint [Mon, 24 Mar 2014 09:46:05 +0000 (10:46 +0100)]
Populate Qt Assistant's TOC from documentation directory.
Task-number: QTBUG-37643
Change-Id: I8c17dc02e8d6c17c88dde24454f09dba76f32148
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Andrew Knight [Mon, 24 Mar 2014 13:16:58 +0000 (15:16 +0200)]
CoreCon: Improve error messaging
This adds another HRESULT_FACILITY to the conmanui whitelist, and adds
fallback to qt_error_string if the string is not found.
Change-Id: Ib4dddeca5cf5ba76e3c7fc5254f85e5a6949febe
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Friedemann Kleint [Mon, 24 Mar 2014 10:25:57 +0000 (11:25 +0100)]
Fix broken navigation in assistant with no webkit.
Broken by
1ebfb744fedf0f9168290da05932079adcc2c536 . Only
printRequested() should be excluded.
Change-Id: I3c94aa62c469fc0cf32b7cbc8740aee3aeead6c2
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Morten Johan Sørvig [Mon, 24 Mar 2014 12:29:43 +0000 (13:29 +0100)]
Compile.
Change-Id: Ifa387592ec4bb39e860b8a62f19ffcbcaf4a22f3
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Friedemann Kleint [Fri, 21 Mar 2014 12:19:09 +0000 (13:19 +0100)]
Update Qt Assistant's TOC for Qt 5.3
Task-number: QTBUG-37643
Task-number: QTBUG-37649
Change-Id: I4c41e971d2656753d4249a2690101fc510f5e193
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Morten Johan Sørvig [Fri, 21 Mar 2014 13:22:12 +0000 (14:22 +0100)]
MacDeployQt:Make sure copied binaries are writable
The source binaries might be read-only, and the
permissions are carried over by the copy. This would
cause failures in later steps like running install_name_tool.
Check the target permissions after copying and set
the writable bit if necessary.
Task-number: QTBUG-23454
Change-Id: I6a84a31be2431f386fa64ad94f7bd9be0cd69639
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Friedemann Kleint [Fri, 21 Mar 2014 10:29:11 +0000 (11:29 +0100)]
Add an autotest for the qtdiag tool.
Change-Id: I4207cb72b3d5b124e6607e8cc4f3c4943e6a4cb3
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Friedemann Kleint [Thu, 20 Mar 2014 13:27:46 +0000 (14:27 +0100)]
Long live qtdiag!
qtdiag is a command line tool that prints information about the Qt
version and the graphics configuration. Its output can be used
for CI logs and customer bug reports.
The code originally was in the manual test qpainfo and
has been turned into a function returning a QString which
can potentially be used in GUI applications as well.
Change-Id: Ic19b6064307eefa67ced7c551a09140b985a89cf
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Joerg Bornemann [Wed, 19 Mar 2014 16:31:32 +0000 (17:31 +0100)]
winrtrunner: install missing dependencies
On install, winrtrunner will check the app's dependencies,
look for them in the directory of the extension SDKs and
install them automatically for the current user.
Task-number: QTBUG-37598
Change-Id: I5639491ee47af16618279245eed4dd94e61f58f9
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Joerg Bornemann [Thu, 20 Mar 2014 10:59:39 +0000 (11:59 +0100)]
winrtrunner: simplify error handling
Introducing the macros CHECK_RESULT and CHECK_RESULT_FATAL
to condense the error checking code blocks into one line each.
Change-Id: I485d21534c44f75d23e465ae6a6f048b6f255c52
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Joerg Bornemann [Thu, 20 Mar 2014 10:32:40 +0000 (11:32 +0100)]
qtd3dservice: use HString class where appropriate
Change-Id: Ia75e2dbda53229691b4d4bc58b2b4dec1f083256
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Joerg Bornemann [Thu, 20 Mar 2014 10:32:08 +0000 (11:32 +0100)]
winrtrunner: use HString class where appropriate
Change-Id: I9b56594b65a545ea98e033ec57788f51cfd6695d
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Friedemann Kleint [Wed, 19 Mar 2014 10:00:02 +0000 (11:00 +0100)]
windeployqt: Add module Qt5MultimediaQuick_p.
Add it as a known module such that it gets an option to
enable/disable it and the name matching works for all multimedia
modules.
Task-number: QTBUG-37576
Change-Id: Iba6a0bd32ad9676d47d20d6a3d75fdb4c1772bcf
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
David Schulz [Tue, 18 Mar 2014 13:14:08 +0000 (14:14 +0100)]
Adding debug option to the winrtrunner.
Added an option that automatically enables debugging for a package with a
provided debugger. An additinal winrtrunner option was introduced to pass
arguments to the debugger.
Change-Id: I55dbc809d26748674e5633f3eb31e7a4b8963655
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Friedemann Kleint [Tue, 18 Mar 2014 15:22:50 +0000 (16:22 +0100)]
Store changed status of the QAxWidget's "control" property correctly.
Handle the case of it being PropertySheetStringValue.
Task-number: QTBUG-37602
Change-Id: Iff54d6409ffabf48406fcfec96289848a42b3e55
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
BogDan Vatra [Tue, 18 Mar 2014 11:03:37 +0000 (13:03 +0200)]
Android: Fix line break.
Change-Id: I0591cba588e2b5ed1fc29aaf32fb40e6ee0cd97d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Andrew Knight [Thu, 13 Mar 2014 13:03:07 +0000 (15:03 +0200)]
qtd3dservice: Add some missing sleeps
The service should sleep in all situations where it intends to try
a task on the next loop iteration. This was missing in two cases in the
Xap handler.
Change-Id: Id32ac66d64e0702fdb00cedd2fc78355d6bd0587
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Andrew Knight [Sun, 16 Mar 2014 10:16:50 +0000 (12:16 +0200)]
winrtrunner: Relay debug messages from local apps
When local (Appx) app runs with -qdevel, it writes all debug messages
to shared memory. This change allows winrtrunner to retrieve and relay
this output to the user. All debug messages are printed with the logging
category "qt.winrtrunner.app" to differientate them from winrtrunner's
own output.
Change-Id: I5a42d33680b75c00624147152a09a4ed9031e33c
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Andrew Knight [Thu, 13 Mar 2014 10:32:23 +0000 (12:32 +0200)]
qtd3dservice: Remove control file handling
This is no longer necessary, as d3dcompiler_qt no longer relies
on a control file.
Change-Id: I689afaf02f30adc3d733aa6fa47bd96c85f8459b
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Stephen Kelly [Mon, 17 Mar 2014 08:58:54 +0000 (09:58 +0100)]
CMake: Fix path to lrelease on debian.
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>
Friedemann Kleint [Mon, 17 Mar 2014 10:41:05 +0000 (11:41 +0100)]
Fix messages about whitespace visualization in Qt Linguist.
Change-Id: I54f9a114650dce691881f3395bbef4cd05dc6634
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Friedemann Kleint [Thu, 13 Mar 2014 16:07:29 +0000 (17:07 +0100)]
Add QQuickWidget as a Qt Designer plugin.
Change-Id: Ie0f87232db5eeab4b2f3c36cd5e209fce727a40d
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Andrew Knight [Thu, 13 Mar 2014 17:36:37 +0000 (19:36 +0200)]
qtd3dservice: Lock the app to a single instance
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>
Andrew Knight [Thu, 13 Mar 2014 16:11:21 +0000 (18:11 +0200)]
qtd3dservice: Fix bad handle close at shutdown
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>
Andrew Knight [Tue, 11 Mar 2014 21:48:32 +0000 (23:48 +0200)]
qtd3dservice: Remove Windows Service mode
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>
Andrew Knight [Tue, 11 Mar 2014 07:12:33 +0000 (09:12 +0200)]
qtd3dservice: Switch to HKLM for appx registry lookup
This works in service mode; the HKCR lookup did not.
Change-Id: Ic4f81f1cb78e03ba8dbde87edaa14ad94b092df5
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Andrew Knight [Tue, 11 Mar 2014 06:39:25 +0000 (08:39 +0200)]
qtd3dservice: Remove registry options
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>
Oliver Wolff [Wed, 12 Mar 2014 07:16:56 +0000 (08:16 +0100)]
qtd3dservice: Disable check for development mode of apps for VS 2012
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>
Joerg Bornemann [Wed, 12 Mar 2014 11:00:08 +0000 (12:00 +0100)]
windeployqt: fix informational output
Spaces were missing and the executable was printed twice.
Change-Id: Ib5ea86a0f32ee345a61f37655d58e5665ef4153d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Andrew Knight [Tue, 11 Mar 2014 13:30:25 +0000 (15:30 +0200)]
winrtrunner: Fix includepath
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>
Friedemann Kleint [Mon, 10 Mar 2014 15:46:38 +0000 (16:46 +0100)]
windeployqt: Deploy d3dcompiler from system only if word size matches.
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>
Andrew Knight [Thu, 6 Mar 2014 15:06:54 +0000 (17:06 +0200)]
qtd3dservice: Support Appx device monitoring
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>
Andrew Knight [Thu, 6 Mar 2014 08:43:09 +0000 (10:43 +0200)]
winrtrunner: Return from wait if the state is unknown
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>
Andrew Knight [Thu, 6 Mar 2014 09:35:37 +0000 (11:35 +0200)]
winrtrunner: Display developer license dialog
... when the license is expired. The installation can then continue.
Change-Id: I11bc13643406ad59611c53da22bdf32dfcd715e7
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Andrew Knight [Wed, 5 Mar 2014 15:19:35 +0000 (17:19 +0200)]
qtd3dservice: Replace a qDebug() with qCDebug()
A non-categorized logging call slipped through the cracks.
Change-Id: I68dac014bdbb41a82ce5e3a2d2fd1a97bbc28c9f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Andrew Knight [Tue, 4 Mar 2014 10:32:14 +0000 (12:32 +0200)]
CoreCon: Remove incorrect argument from SendFile()
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>
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>