Eskil Abrahamsen Blomfeldt [Fri, 8 Nov 2013 12:46:36 +0000 (13:46 +0100)]
androiddeployqt: Fix signing package with -verbose
We would put the "-v" option inside the quotes in the zipalign
command, causing the shell to look for the executable named
"zipalign -v".
Task-number: QTBUG-34588
Change-Id: I88269cada9d77c3ddcceb6133f9bc8cf275c425a
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Eskil Abrahamsen Blomfeldt [Fri, 8 Nov 2013 08:34:55 +0000 (09:34 +0100)]
androiddeployqt: Share information on why plugins are skipped
When we skip a plugin due to missing dependencies, we should
output which dependencies are missing so that people can easily
find out what to add to their .pro files.
Task-number: QTBUG-34586
Change-Id: I64e1687e4ad67165b0d8708e1e1fcedc10883515
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Friedemann Kleint [Fri, 8 Nov 2013 15:03:21 +0000 (16:03 +0100)]
windeployqt: Move finding shared libraries into a function in utils.
As it is also needed by qmlutils when scanning QML-imports.
Change-Id: Ia9952171e4bab60984562eb0db860751fd54f572
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Eskil Abrahamsen Blomfeldt [Thu, 7 Nov 2013 12:44:52 +0000 (13:44 +0100)]
androiddeployqt: Support default permissions/features for module
Read the permissions/features required for the module from the
dependency XML and update the default AndroidManifest.xml to
include these.
Task-number: QTBUG-33953
Change-Id: I52edce7ebf826d242fbb49dcd8069c60a1381116
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Friedemann Kleint [Wed, 6 Nov 2013 15:50:18 +0000 (16:50 +0100)]
Qt Designer: Implement property() for QAxWidgetPropertySheet.
Access the control property of the QAxWidget directly.
Task-number: QTBUG-34592
Change-Id: I7d0971ad8fc265d0443da7ae72330e2b7f3a8d70
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Jerome Pasion [Tue, 5 Nov 2013 12:36:47 +0000 (13:36 +0100)]
Doc: Updated url variable in qdocconf files.
In 5.2, the HTML output is in a flatter structure and when they are
hosted in qt-project.org/doc, the documentation will be found at
http://qt-project.org/doc/qt-$QT_VER
The url variable is used by projects outside of Qt 5 which need
to link to Qt 5 documentation, such as Qt Creator.
Task-number: QTBUG-34584
Change-Id: Ic0eed7f0d5fbc04544858b8dda3637ea788daac8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Morten Johan Sørvig [Tue, 5 Nov 2013 13:49:47 +0000 (14:49 +0100)]
Make macdeployqt deploy audio plugins.
Deploy plugins/audio if QtMultimedia.framework is
in use.
Change-Id: I164ddddbf2fbd50c37d42809b5ecdda0ea1d03af
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Eskil Abrahamsen Blomfeldt [Mon, 4 Nov 2013 13:00:08 +0000 (14:00 +0100)]
androiddeployqt: Put back default app name
When no custom AndroidManifest.xml is specified, we need to
generate a sensible default name like before.
Change-Id: I9411594c43f6d2b3a49686bb6fbab9d999d788c3
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Friedemann Kleint [Mon, 4 Nov 2013 12:49:20 +0000 (13:49 +0100)]
windeployqt: Introduce constants and functions for shared library suffixes.
Change-Id: Ic0792d0935115ab8554288979adabd17ea8cf863
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Friedemann Kleint [Mon, 4 Nov 2013 12:31:36 +0000 (13:31 +0100)]
windeployqt: Clean up declarations.
Change-Id: I116560a3c10beed9efdc75b240984449f2b6e168
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Friedemann Kleint [Mon, 4 Nov 2013 12:22:34 +0000 (13:22 +0100)]
windeployqt: Update modules list.
Change-Id: Icfac93eb3cc3858a49043f5dafe32725796adcbc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Eskil Abrahamsen Blomfeldt [Fri, 1 Nov 2013 14:07:28 +0000 (15:07 +0100)]
androiddeployqt: Make sure generated package name parses
We need to make sure the generated package name does not break
any parser rules in Java. The cleanPackageName() function is
copied from Qt Creator.
Task-number: QTBUG-34245
Change-Id: Ice2f10e25f7f1d93c87c5ced2659e63d386e51a0
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Topi Reinio [Fri, 1 Nov 2013 13:48:43 +0000 (14:48 +0100)]
Doc: Remove incorrect dependencies
Remove dependencies to nonexistent module 'qtbase'
from .qdocconf files.
Change-Id: If299d764a5c2e0d0d83551f74e30ead70c26aa10
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
BogDan Vatra [Mon, 28 Oct 2013 16:30:14 +0000 (18:30 +0200)]
Remove -quiet parameter, it hides also some errors.
Change-Id: I43dbe412a61d22afe0a01245904785a6cace235d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Dmitry Shachnev [Tue, 29 Oct 2013 15:20:47 +0000 (19:20 +0400)]
qtpaths: Remove duplicate table entries.
Remove DesktopLocation and DocumentsLocation from lookupTableData as they were
wrongly listed twice there.
Change-Id: Ie8b91c294ead114c26857778cf644dbaba181d42
Reviewed-by: Sune Vuorela <sune@vuorela.dk>
Reviewed-by: David Faure <david.faure@kdab.com>
BogDan Vatra [Thu, 31 Oct 2013 11:53:17 +0000 (13:53 +0200)]
Remove android specific qmake variables.
Change-Id: I77b0d880abb0a78baf02c2b6be33ca61f9233500
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Friedemann Kleint [Fri, 25 Oct 2013 12:22:03 +0000 (14:22 +0200)]
windeployqt: Fix matching of modules to take substrings into account.
Qt5WebKitWidgets was not deployed since Qt5WebKit always matched
the library name.
Change-Id: I2bf7268cb2b9db4bf3daf97657c1baf635224e07
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Eskil Abrahamsen Blomfeldt [Fri, 18 Oct 2013 11:53:22 +0000 (13:53 +0200)]
androiddeployqt: Remove support for QMAKE_SUPPORTED_ORIENTATIONS
This was created for the iOS port and intended to be cross-platform,
but since then they got cold feet and never added the support.
It makes no sense to only support this on Android. We need to
remove it again and hold off until we can find a proper solution.
Editing the AndroidManifest.xml is the non-cross-platform
solution for this.
Task-number: QTBUG-34166
Change-Id: Ide8abb159266bcb2af03667ecf8d92da127960b1
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Friedemann Kleint [Tue, 22 Oct 2013 14:52:21 +0000 (16:52 +0200)]
Fix resetting of string properties.
Task-number: QTBUG-34171
Change-Id: Ib5fe8194d891eb999e41bafde19834be56c84103
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Topi Reinio [Tue, 29 Oct 2013 13:54:20 +0000 (14:54 +0100)]
Doc: Rename doc directory of Context Sensitive Help example
During packaging, the doc/ directories are removed from
examples when they are copied to Qt examples install
directory.
This example has a doc/ directory with contents required
to run it. This change renames it so that he packaging
doesn't break it.
Task-number: QTBUG-33848
Change-Id: I7b4e29d7b3c2c2ff9429c1a81bd32fb809d0cdb3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Oswald Buddenhagen [Thu, 5 Sep 2013 16:30:05 +0000 (18:30 +0200)]
make setting a bad $$[QMAKEFEATURES] not crash qmake
Task-number: QTBUG-29642
Change-Id: I9cc209eb313f03bf342bcb64b1de3005755700a7
(cherry picked from qtbase/
50a90720be7d67dcdfe704a82fb3b1138edd2aab)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Morten Johan Sørvig [Mon, 28 Oct 2013 18:09:58 +0000 (19:09 +0100)]
Add JSON parsing support to qmake.
Add qjson* implementation files from corelib/json
to the qmake build. Add a read-only compile mode,
enabled by defining QT_JSON_READONLY.
Add qmake built-in function parseJson(file, into)
which parses a json file into the given variable.
qmake uses a flat key -> value-list implementation
for storing variables, which means that some hackery
is need to represent arbitrarily nested JSON. Use a
special "_KEYS_" variable for arrays and objects:
Arrays:
["item1", "item2"]
$${array._KEYS_} -> 0 1 2
$${array.0} -> "item1"
$${array.1} -> "item2"
Objects:
{ "key1" : "value1", "key2" : "value2" }
$${object._KEYS_} -> key1 key2
$${object.key1} -> value1
$${object.key2} -> value2
Change-Id: I0aa2e4e4ae14fa25be8242bc16d3cffce32504d2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/
89ef515177fd5a0b5d95dcffd5fd0b0669e3625a)
Reviewed-by: hjk <hjk121@nokiamail.com>
Tor Arne Vestbø [Wed, 23 Oct 2013 12:02:59 +0000 (14:02 +0200)]
qmake: Expose qmake arguments as QMAKE_ARGS
Allows project files or mkspecs to call qmake recursively using system()
with the right arguments, which we use to fix the ios default_post.prf.
Change-Id: I90d69e2b156bb0f0af1279188b11f81c84c24fb8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtbase/
1cdbe4752bef972db5471e811e9a781749cd0380)
Reviewed-by: hjk <hjk121@nokiamail.com>
Tor Arne Vestbø [Fri, 11 Oct 2013 13:48:44 +0000 (15:48 +0200)]
qmake: Update internal mkspec on changes to QMAKESPEC
Allows the macx-xcode mkspec to be a wrapper around other mkspecs.
Since QMAKESPEC can now be set in the spec, we have to ensure not
to append to QMAKESPEC.
Change-Id: Idf33ff38147f14c488f14b426c02d9a739fdaecf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtbase/
a9bad65b091d15b0446fa141e0a69ebb94b38b70)
Tor Arne Vestbø [Tue, 8 Oct 2013 21:44:24 +0000 (23:44 +0200)]
qmake: Evaluate extra configs before loading default_pre
Exclusive builds uses setExtraConfigs to apply the particular CONFIG
of each build pass. Unfortunately we were not applying these extra
configs early enough in QMakeEvaluator::visitProFile() for them to
be picked up/usable by default_pre, something that can be useful.
Change-Id: I423a4688250a15f0c1a2cc65a48f0bbc14ad4497
(cherry picked from qtbase/
eea1c359c9663cec15e7373c065ee06cba151eed)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Tor Arne Vestbø [Wed, 9 Oct 2013 14:26:44 +0000 (16:26 +0200)]
qmake: Load extra variables only if also loading pre-files
The extra variables only need to be applied once, when we
are loading the pro file (and hence are loding pre files),
not for every single pri/prf that's loaded as a result of that
(which do not load pre files themselves).
Change-Id: I3118694a8eeccf2dc32c4f62df754033fad13528
(cherry picked from qtbase/
8e7dc25380dceebca094e092d9feb21ad167ba91)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Tor Arne Vestbø [Thu, 19 Sep 2013 15:21:39 +0000 (17:21 +0200)]
qmake: Expose ARGC to qmake functions to be able to check argument count
ARGS already exists, but is a flattened list of the arguments, so both
foo(bar, baz) and foo(bar baz) will give count(ARGS, 2), making it
unreliable for validating arguments to qmake functions.
Change-Id: I0bcc16614c64000169431327da48fd1a26708e67
(cherry picked from qtbase/
09205d573413da8a2ac3826198fe36bb2dc4349f)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Tor Arne Vestbø [Thu, 19 Sep 2013 11:21:26 +0000 (13:21 +0200)]
qmake: add $$title() function to convert strings to title case
Change-Id: Ic535a8f7cc2ab7b7f1948b2d0237ebe9a71c7ec7
(cherry picked from qtbase/
413ec67fc46ad7049f870cdb8ead35149b215d45)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Daniel Teske [Fri, 6 Sep 2013 13:14:38 +0000 (15:14 +0200)]
ProParser: Plug raw data leak
QProcessEnvironment caches keys, so we must not pass it QStrings created with
fromRawData()
Task-number: QTCREATORBUG-9142
Change-Id: I29fade02f3bc4110fafb1b04d44f2e653951a2ae
(cherry picked from qtcreator/
99f15f1706868c4b2f84bc4164451bd69b3b8188)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Oswald Buddenhagen [Thu, 17 Oct 2013 17:13:28 +0000 (19:13 +0200)]
remove pointless statements
the INCLUDEPATH to the corelib build dir is useless and plain bogus (it
wouldn't work in a modular build anyway).
CONFIG+=console is pointless, because qt_tool does it.
Change-Id: Ifa9a19c7be6a866b26eb980d5b34ab00b3503d49
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Oswald Buddenhagen [Fri, 25 Oct 2013 10:26:47 +0000 (12:26 +0200)]
query the presence of the right module
the existence of a -private module does not imply the presence of a
public module any more, so we need to test for qmldevtools-private
explicitly.
Change-Id: Ibd691d758bcaf9c07280bd560521f4947be98f06
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Paul Olav Tvete [Thu, 17 Oct 2013 15:18:45 +0000 (17:18 +0200)]
Use stdout for debug output
We need to use the same stream for all debug output, otherwise
they will be shown out of order. Also add some more verbosity.
Change-Id: I66d2e1e67fb6303178a8240815d9faff396f77ea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Paul Olav Tvete [Tue, 29 Oct 2013 12:50:14 +0000 (13:50 +0100)]
Fix dependency detection corner case
Also skip indirect dependencies from the "bundled" element if
their dependencies are not explicitly included.
Task-number: QTBUG-34285
Change-Id: Iedb726c35d1c979a2ebab551095edcf4ce5cb3a1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
BogDan Vatra [Tue, 15 Oct 2013 10:34:20 +0000 (13:34 +0300)]
Fix deploy mechanism.
The order of "android:value" and "android:name" attributes can be changed when
saving the XML document. Use placeholders instead.
Change-Id: I32e7bf0c91565f5e219d16f549cf1c6583398df0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
BogDan Vatra [Tue, 15 Oct 2013 06:09:54 +0000 (09:09 +0300)]
Move untranslatable stings to AndroidManifest.xml
strings.xml file is used to store strings that can/should be internationalized.
Change-Id: Ib55eff12c905dc09384832ce8ce6865903f60a66
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
BogDan Vatra [Fri, 18 Oct 2013 13:33:49 +0000 (16:33 +0300)]
Smarter plugins resolver.
Don't copy plugins with unmet dependencies.
Change-Id: I6e84166fac5e5553bf3d5b87982eba8255160ae7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Andrew Knight [Sat, 19 Oct 2013 14:26:02 +0000 (17:26 +0300)]
Move JSON handling into utils
This allows for every copied file to get added to the JSON output.
Change-Id: I588c173056d359d514e2c1715837b5ce4bf71cb0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Eskil Abrahamsen Blomfeldt [Fri, 18 Oct 2013 08:11:04 +0000 (10:11 +0200)]
Android: Remove non-host tools
Command line applications for target architecture does not work on
Android, since apps there are Java applications which call into a
shared library. Thus, these command line tools which are not built for
host architecture are not usable in a SUBDIRS build. They need to be
built and deployed separately in apk packages.
Change-Id: Ia7322ee143a1b73ac40459f078e9f51a4e29a3ab
Reviewed-by: BogDan Vatra <bogdan@kde.org>
BogDan Vatra [Thu, 17 Oct 2013 11:17:18 +0000 (14:17 +0300)]
Fix handling android dependency xml.
Run readAndroidDependencyXml only once for every Qt library.
Task-number: QTBUG-34078
Change-Id: Ifc2c18f23485e2ced20b0ce3f151a21cb1a0069a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Eskil Abrahamsen Blomfeldt [Wed, 16 Oct 2013 12:44:10 +0000 (14:44 +0200)]
androiddeployqt: Use correct prefix for tools on x86
When building for x86, the prefix for the tools is not equal
to the prefix for the toolchain directory, so we need a separate
option for this.
Task-number: QTBUG-34110
Change-Id: I72d727832dd4a5f11952c84882496f85075cd9cd
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Paul Olav Tvete [Tue, 15 Oct 2013 12:20:55 +0000 (14:20 +0200)]
androiddeployqt: fix dependencies of plugins
The dependency resolver is based on a recursive descent of
the dependency tree. Plugins depend on the libraries, so they
have to be handled after the libraries have been resolved.
The simplest solution is to do multiple passes over the unmet
dependencies from the plugin.
Task-number: QTBUG-34078
Change-Id: I02d8d7c86f77f6c23832a6e301567796b412c5aa
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Friedemann Kleint [Mon, 14 Oct 2013 11:21:00 +0000 (14:21 +0300)]
Assistant: Update list of modules for 5.2.
Change modules list to a const char * array for easier
maintenance. Add missing qtbluetooth, qtandroidextras,
qtlocation, qtnfc, qtpositioning,
qtsensors, qtquickdialogs, qtwinextras.
Task-number: QTBUG-34072
Change-Id: Idf178e8d3b3f17f488d8c0ec48dbafde5b73ade2
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Friedemann Kleint [Fri, 11 Oct 2013 14:12:55 +0000 (16:12 +0200)]
windeployqt: Fix deployment of command line applications.
Do not return when not finding any matching plugins.
Change-Id: I176633f4089ba03f29977187c828a5070de381b2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Tue, 8 Oct 2013 15:43:32 +0000 (17:43 +0200)]
correctly resolve INCLUDEPATH relative to current project
Task-number: QTBUG-24587
Change-Id: I1384403e5c5e3313649fa4abb98e7578cae4677b
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Tue, 8 Oct 2013 15:43:20 +0000 (17:43 +0200)]
INCLUDEPATH does *not* act as VPATH for HEADERS
Change-Id: Ibbcc5d40d475d88694b527ef9fab6bc75075d97c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Tue, 8 Oct 2013 15:42:20 +0000 (17:42 +0200)]
don't look for sources in FORMS3
amends
17af244afa7
Change-Id: Ie718df1bed4e1c78390c1a6e76a99f13f5e4f136
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Tue, 8 Oct 2013 13:06:29 +0000 (15:06 +0200)]
don't unnecessarily claim that gui is needed
Change-Id: Ie5d2c0d74f3b47e7f5cf0a3d34b84b382f01f7bd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Thiago Macieira [Mon, 7 Oct 2013 21:51:54 +0000 (14:51 -0700)]
Keep the copied files as writable
Mac's strip tool doesn't work if the file is read-only. Some of the
libraries we copy might be read-only (like those installed by
HomeBrew) and that would cause stripping to fail.
Change-Id: Ie8caa853a26794ec97ec84354d9f7bb142cce993
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Eskil Abrahamsen Blomfeldt [Mon, 7 Oct 2013 08:20:47 +0000 (10:20 +0200)]
androiddeployqt: Don't detect directories as executable files
When looking for an executable on the PATH we would mistakenly
report directories with the same filename (like "ant") as
the correct executable.
Task-number: QTBUG-33907
Change-Id: I7122e6f8da7a3027666e9dfc3040a17c2876e981
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Friedemann Kleint [Mon, 7 Oct 2013 12:12:57 +0000 (14:12 +0200)]
Qt Designer: Temporarily disable loading of QDeclarativeView plugin.
Avoid symbol clashes between QtQuick1 and QtQml.
Task-number: QTCREATORBUG-10273
Change-Id: I84d5b378b9e246d67d8114f701ba5d012cbf5cff
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Morten Johan Sørvig [Thu, 15 Nov 2012 06:08:44 +0000 (07:08 +0100)]
Macdeployqt: Deploy QML imports.
Use qmlimportscanner from QtDeclarative to find used
imports.
New option:
-qmldir=<path> : Deploy imports used by .qml files
in the given path. (defaults to ".")
Change-Id: I3efa47557a1b5aae0ad838024ba5fe1a98be3b16
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Paul Olav Tvete [Tue, 1 Oct 2013 13:59:59 +0000 (15:59 +0200)]
androiddeployqt: make it easier to diagnose problems
Enumerate the enum so we don't have to count the values
each time we need to make sense of the return code.
Change-Id: Ibe168798fb167659688519b2cd833a1894a9deec
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Paul Olav Tvete [Tue, 1 Oct 2013 13:53:40 +0000 (15:53 +0200)]
Make deployment on Android work again when device is specified
When fixing the case of executable path names with spaces, we
accidentally put an option inside the quotation marks.
Change-Id: Ia3bcf8415d1a936a85fe1b0900d47ffd87daf667
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Oswald Buddenhagen [Mon, 30 Sep 2013 16:11:43 +0000 (18:11 +0200)]
add missing file
amends
35139d45
Change-Id: I53a65e9410a7c6bcd3d28c3b4b416d275679436f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Mon, 26 Aug 2013 14:09:06 +0000 (16:09 +0200)]
Long live windeployqt!
Add windeployqt for deploying Windows/Windows Runtime applications.
Change-Id: Ia6ca4af13a93fdc75ef6fe4f794cbe228533e85f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
Eskil Abrahamsen Blomfeldt [Thu, 26 Sep 2013 07:06:15 +0000 (09:06 +0200)]
androiddeployqt: Fix overriding auto-detected deployment
The platform plugin is set as part of the whole autodetection
step. When this step is not run because deployment is explicitly
set in the .pro file, we should still detect the platform plugin.
The way we do this is by checking which platform plugin is
included in the deployment settings and using this.
Change-Id: I189972a34f03b9059db84bc41855ac662071ca11
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Eskil Abrahamsen Blomfeldt [Thu, 26 Sep 2013 06:31:44 +0000 (08:31 +0200)]
androideployqt: Allow executable paths with spaces
When the path for an executable contains a space (like when running
jarsigner from "Program Files" on Windows, we need to quote it before
passing it to the shell. We just quote all executables to make it simple.
Change-Id: I1a387c2d846ed0f0ee6aca36b7414b0da827dde3
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
ABBAPOH [Mon, 23 Sep 2013 16:58:40 +0000 (20:58 +0400)]
Add QKeySequenceEdit to Qt Designer
Change-Id: I0efe3f58539fef59154d1c07e6c044bb45fe53cf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Friedemann Kleint [Tue, 24 Sep 2013 14:19:40 +0000 (16:19 +0200)]
Remove QtAlgorithms usage from Qt Assistant.
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I6f02d91289c3f455d8643b145fb2c6477863056c
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Friedemann Kleint [Tue, 24 Sep 2013 08:17:34 +0000 (10:17 +0200)]
Remove QtAlgorithms usage from Qt Designer.
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I2c7057557295a9bbc83b3d7c625b04400d9e6c2a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Friedemann Kleint [Wed, 25 Sep 2013 09:45:35 +0000 (11:45 +0200)]
Remove QtAlgorithms usage from Qt Linguist and its tools.
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I3d74510693a5144b536cf515077d870e380d47df
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Paul Olav Tvete [Tue, 24 Sep 2013 08:30:23 +0000 (10:30 +0200)]
Remove usage of deprecated function qSort
Change-Id: Ic99f7627430546a44a5290f913a35b2ba6d664b5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Paul Olav Tvete [Tue, 24 Sep 2013 08:32:32 +0000 (10:32 +0200)]
Work around wrong return code from pclose
When we do not read the process output, pclose returns an error code even
if the process completes successfully. The simple fix is to always
read the output, even if we don't need it.
Change-Id: Idaec75acbdea6a911aede04506cbd403120b3d92
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Eskil Abrahamsen Blomfeldt [Fri, 30 Aug 2013 06:23:03 +0000 (08:23 +0200)]
Add tool to deploy Qt applications on Android
This tool automates building an Android project with
either bundling deployment or Ministro. It can be used
from the command line and will also be used from Creator
to create packages.
Task-number: QTBUG-32856
Change-Id: I89716127d192618054317d1412f3bb224a4a81a4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Sergio Ahumada [Wed, 18 Sep 2013 19:50:01 +0000 (21:50 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I8f0a0ffd5e83828d3d0910ece4ec0485c85f2d14
Mitch Curtis [Tue, 10 Sep 2013 08:16:43 +0000 (10:16 +0200)]
Fix no such signal error on assistant startup with no webkit.
QObject::connect: No such signal HelpViewer::printRequested() in
qttools/src/assistant/assistant/centralwidget.cpp:626
Change-Id: If7dee3b8d38f659ca037b9d4ed73e01779f07c67
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Sergio Ahumada [Fri, 13 Sep 2013 14:43:11 +0000 (16:43 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia3604754fdb32b0e358a635b0bb16d4fa312bf2d
Sune Vuorela [Fri, 5 Jul 2013 12:07:18 +0000 (14:07 +0200)]
Command line client to standard paths
This tool is usable within scripts and for debugging to query
paths and executables and whatever QStandardPaths will report.
Also a few additional outputs.
See also: kde4-config tool.
Change-Id: I1c10257df80da537eaa85354810dcc051211c602
Reviewed-by: David Faure <david.faure@kdab.com>
Jerome Pasion [Thu, 12 Sep 2013 12:50:10 +0000 (14:50 +0200)]
Doc: Fixing "clcik" to "click"
Change-Id: Ia6c59c286e08ccef85c2e7c73ab07073544f5ac3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Sergio Ahumada [Fri, 6 Sep 2013 12:33:37 +0000 (14:33 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie422cd4d1e634ac7bbd37e98b6cdffa2e75ab58e
Oswald Buddenhagen [Mon, 2 Sep 2013 14:43:49 +0000 (16:43 +0200)]
print project errors after all. sometimes.
we evaluate prf files precisely, so we need to see their errors, as they
may give a hint why they terminated prematurely.
however, we prefix the errors with "WARNING:" to make them less scary.
Change-Id: Ia14953a5a9dc31af56ad6c338017dd5b85bb4494
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Mon, 2 Sep 2013 14:46:10 +0000 (16:46 +0200)]
remove dead code for printing parser/evaluator warnings
we print only errors anyway.
amends
3d960a16dc9
Change-Id: Iac1c69e1ae94229e3702d7e67163f9a60d04decc
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Mon, 2 Sep 2013 14:52:47 +0000 (16:52 +0200)]
make CONFIG feature evaluation failure non-fatal in cumulative mode
while we evaluate the features themselves in precise mode (which is the
reason why they can error out), we do not want them to terminate
cumulative project evaluation.
Change-Id: I70f3e1bcb2ca04a70c74ff484749ca92c1cf6372
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Mon, 2 Sep 2013 14:59:34 +0000 (16:59 +0200)]
purge phonon config
Change-Id: If6d2d99b04345c29ff3c51616ff913771f3b8c11
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Fri, 12 Apr 2013 13:24:55 +0000 (15:24 +0200)]
Use QLineEdit's clear button feature in in Qt Designer.
Remove old filter widget.
Change-Id: Id65eee844d85df2d3c5a87f5acc26ba154d202c9
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Frederik Gladhorn [Tue, 27 Aug 2013 20:46:13 +0000 (22:46 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I5db3f62185e7e99ce2c701debd00a44f40a9f5e5
Takumi Asaki [Thu, 1 Aug 2013 08:09:40 +0000 (17:09 +0900)]
Linguist: Fix layout of message editor for length variants
Task-number: QTBUG-14348
Change-Id: I6475cd87df4bd1fe1729d437fa01f5f46d362395
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 23 Aug 2013 12:37:10 +0000 (14:37 +0200)]
update the form preview upon switching the current translation
Task-number: QTBUG-7964
Change-Id: I6555f7f1d51329923bfa24b44c048e47c4606e7f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Mon, 26 Aug 2013 16:55:02 +0000 (18:55 +0200)]
don't disable error view just because of lacking location info
amends
94584dcdd
Change-Id: I5fe662a54e140a25894975dbefc74b221b16d3d8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 21 Aug 2013 08:51:57 +0000 (10:51 +0200)]
actually recognize -drop-tags argument
it's what is documented.
-drop-tag is still supported, both for backwards compat and because it's
kinda intuitive.
Task-number: QTBUG-33092
Change-Id: I8bf1a7873b8f2c39c98e8676433d2fe7fabf62c4
Reviewed-by: hjk <hjk121@nokiamail.com>
Oswald Buddenhagen [Mon, 19 Aug 2013 15:47:40 +0000 (17:47 +0200)]
search in plural forms after all
our search is not fuzzy, so for some languages it makes a lot of sense
to search in the plurals, as they may use different grammatical forms.
Task-number: QTBUG-32218
Change-Id: I9ba2e370f9bcc564e707b2339ab0b1e73935c03d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Mon, 19 Aug 2013 15:41:50 +0000 (17:41 +0200)]
search translator comments of every translation
Change-Id: I45ce7c0d22826ec9d383da65a8018356569ebd3a
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Mon, 19 Aug 2013 15:41:27 +0000 (17:41 +0200)]
de-duplicate code paths
Change-Id: I368b0adb7cc96f40465d176a01196697eb09db4c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Mon, 19 Aug 2013 11:04:48 +0000 (13:04 +0200)]
fix search occasionally skipping messages
the bizarre persistence of m_foundWhere would make us skip a hit in a
directly subsequent message if the match was in a field that is searched
before the field the last hit was in.
Task-number: QTBUG-32196
Change-Id: I5007d435cfc3a96bb2b61875a5fc40ac6a23c548
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 24 Jul 2013 17:49:38 +0000 (19:49 +0200)]
change reporting of missing files
use the new parser flags to report all i/o errors directly.
as a notable side effect, the "WARNING" prefix is gone (even though
it is still treated like that, which is mildly insane to start with).
Change-Id: I084375d5e7a3314ae763795f7c318804a9fb84b6
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/
b4c0d9166e7a8f5dfa5ca052002a5ab318787aa2)
Oswald Buddenhagen [Mon, 19 Aug 2013 16:54:03 +0000 (18:54 +0200)]
collect messages from INSTALL and DEPLOYMENT file lists
Task-number: QTBUG-14056
Change-Id: I1e014885f92b8587462d926e552834915fc1be60
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Mon, 19 Aug 2013 16:54:38 +0000 (18:54 +0200)]
fix arguments of main() in test data
not that it would matter, but ...
Change-Id: I798eb118e623cf22c7288cda7b5d806eba8a6065
Reviewed-by: hjk <hjk121@nokiamail.com>
Oswald Buddenhagen [Thu, 8 Aug 2013 16:33:23 +0000 (18:33 +0200)]
add -pro-debug option: trace .pro evaluation (like qmake -d)
Change-Id: I2f6a3d43fa5e65fb6bfa44c17d833d9b8a30e06a
Reviewed-by: hjk <hjk121@nokiamail.com>
Oswald Buddenhagen [Mon, 26 Aug 2013 13:36:34 +0000 (15:36 +0200)]
fix setting the output directory for the qmake evaluator
not so wise to use the project file instead of its parent directory ...
amends
f51f7b7b95
Change-Id: I35b18f81a86d097b82b8184669b0231810c66f73
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 3 Jul 2013 11:54:17 +0000 (13:54 +0200)]
make split_value_list() even less sane again
contrary to what one may expect, it's actually *not* supposed to remove
the meta-characters it interprets.
luckily, this function is not used much any more ...
Change-Id: I2b60f9b173140da78db2b07b596cc2e5f6e6d555
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/
783181cfc11e995ad678237ebc0025a2a023c88c)
Oswald Buddenhagen [Mon, 12 Aug 2013 19:12:36 +0000 (21:12 +0200)]
avoid deadlock in cache() during spec/cache loading
sync up; doesn't do anything in lupdate.
if we end up calling cache() from within the initialization of the base
context, we cannot wait for for the completion of that initialization
before we proceed, obviously.
Change-Id: If30c6f3665fe423e767373a8821c406b2f5e0eca
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtcreator/
b64b4431c20afd9e39c1463e736f998ef450688f)
Oswald Buddenhagen [Tue, 23 Jul 2013 15:57:44 +0000 (17:57 +0200)]
lock baseEnv in cache()
sync up; doesn't do anything in lupdate.
as we modify the environment, it must be properly locked.
this implies that initFrom() also needs to be called with a lock.
Change-Id: I48bae9af9adaa0518e5a9db0ba08ff057ae14f9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtcreator/
d022a2d19cecb00397c2a215fc4e3bf64b1e627b)
Oswald Buddenhagen [Tue, 23 Jul 2013 15:27:34 +0000 (17:27 +0200)]
always check for baseEnv init failure
sync up; doesn't do anything in lupdate.
creator's file watcher can trigger many parallel, entirely
non-hierarchical project reloads. if there is enough of them to exceed
the thread pool size, some will be serialized already by qtconcurrent,
not by our wait condition. these should notice a faulty spec, too.
Change-Id: I8ce40cb90fbc28045127881d57ec94e125df79af
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtcreator/
759d0a69dd3973b4785b6f9412f46666a05cdf85)
Chris Stylianou [Fri, 21 Jun 2013 14:02:39 +0000 (15:02 +0100)]
Fix incorrect uname usage.
The POSIX function uname() can return any non-negative value for success.
- Example: Solaris 10 returns 1 on success.
See: http://pubs.opengroup.org/onlinepubs/
009695399/functions/uname.html
Change-Id: Ic3d51f94a31d8b562b28a2d09df3d31b04c77dc8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtbase/
e97c37a37ac27f9ab901e974f0a882e81ffd571d)
Oswald Buddenhagen [Tue, 11 Jun 2013 17:06:18 +0000 (19:06 +0200)]
find qmakespecs in source directory of shadow built qt
qt 5.2 does not copy the qmakespecs to the build directory any more.
a fallback to the /get property variant ensures that other build types
continue to work. consequently, this has no effect whatsoever on
installed qt versions.
(based on qtbase/
214b55d5d4c8fdf975b3c36f69bac4b07d8d39d0)
Task-number: QTCREATORBUG-9572
Change-Id: I9edac11f8997fcb0594d0a67419d4733dd4ed86b
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtcreator/
958672e4607acf654b0fe5f35a385e95a3042f23)
Oswald Buddenhagen [Tue, 11 Jun 2013 14:08:30 +0000 (16:08 +0200)]
introduce /src qmake property variants
this is for shadow builds during build time, where the respective files
are expected in the source dir.
Change-Id: I18dcfbdef99e1562a51dacac333642cae8105ebd
(cherry picked from qtbase/
4531c83376c1a3546305a9fa5203e0a885e8860d)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Oswald Buddenhagen [Wed, 5 Jun 2013 13:44:46 +0000 (15:44 +0200)]
remove pointless string conversion
Change-Id: I1640083007ed0c428dfb8ab5ce8b68a7d7e2a749
(cherry picked from qtbase/
d1b1b31c9237e0bd11c61fc54ad45551b7d862da)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Oswald Buddenhagen [Mon, 3 Jun 2013 19:59:27 +0000 (21:59 +0200)]
make .qmake.{super,cache,conf} find "anchored" features
these files function as "anchors" for mkspecs/ and features/ directories
used by projects which load these files. ironically, these files didn't
see these feature files themselves.
Change-Id: I590855eb4a9d2c72b9abfcaa431d2f85a719c6e2
(cherry picked from qtbase/
7456dfb4552c4e4f900af9fa8923828a23737280)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Oswald Buddenhagen [Mon, 3 Jun 2013 19:56:51 +0000 (21:56 +0200)]
find features/ under mkspecs/ of source & build root
we were finding features/ directly in the source & build root, and we
were finding features/ under mkspecs/ from $QMAKEPATH and other mkspecs
locations, but we omitted the "transitive hull". this was
counterintuitive.
Change-Id: I9823e6606467c98f264c81385250da92311f51ca
(cherry picked from qtbase/
0bf65180b8710e4516496d0bc53a265ff0dd6a01)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 14 Jun 2013 07:50:46 +0000 (09:50 +0200)]
make Makefiles not depend on .qmake.super
sync with qmake. this is a no-op in lupdate.
Change-Id: Id5158d7e272fdee4f4a041fb7c828295a0a86684
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/
d135a311a34e693d761a3607663b0879be9bbf65)