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>

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>

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>

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)

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

Smarter plugins resolver.

Don't copy plugins with unmet dependencies.

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

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

don't unnecessarily claim that gui is needed

Change-Id: Ie5d2c0d74f3b47e7f5cf0a3d34b84b382f01f7bd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

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>

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>

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>

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>

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>

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>

add missing file

amends 35139d45

Change-Id: I53a65e9410a7c6bcd3d28c3b4b416d275679436f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

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>

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>

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>

Add QKeySequenceEdit to Qt Designer

Change-Id: I0efe3f58539fef59154d1c07e6c044bb45fe53cf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

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>

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>

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>

Remove usage of deprecated function qSort

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

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>

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>

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

Change-Id: I8f0a0ffd5e83828d3d0910ece4ec0485c85f2d14

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>

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

Change-Id: Ia3604754fdb32b0e358a635b0bb16d4fa312bf2d

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>

Doc: Fixing "clcik" to "click"

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

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

Change-Id: Ie422cd4d1e634ac7bbd37e98b6cdffa2e75ab58e

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>

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>

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>

purge phonon config

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

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>

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

Change-Id: I5db3f62185e7e99ce2c701debd00a44f40a9f5e5

Linguist: Fix layout of message editor for length variants

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

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>

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>

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>

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>

search translator comments of every translation

Change-Id: I45ce7c0d22826ec9d383da65a8018356569ebd3a
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

de-duplicate code paths

Change-Id: I368b0adb7cc96f40465d176a01196697eb09db4c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

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>

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)

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>

fix arguments of main() in test data

not that it would matter, but ...

Change-Id: I798eb118e623cf22c7288cda7b5d806eba8a6065
Reviewed-by: hjk <hjk121@nokiamail.com>

add -pro-debug option: trace .pro evaluation (like qmake -d)

Change-Id: I2f6a3d43fa5e65fb6bfa44c17d833d9b8a30e06a
Reviewed-by: hjk <hjk121@nokiamail.com>

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>

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)

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)

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)

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)

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)

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)

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>

remove pointless string conversion

Change-Id: I1640083007ed0c428dfb8ab5ce8b68a7d7e2a749
(cherry picked from qtbase/d1b1b31c9237e0bd11c61fc54ad45551b7d862da)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

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>

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>

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)

update m_featureRoots less aggressively

it's not necessary to immediately re-calculate the roots after assigning
QMAKE_PLATFORM - it's sufficient to do it on-demand, so merely
invalidate them. this avoids that we re-calculate them multiple times
without ever using them in between while processing specs with
distributed platform assignments.

Change-Id: If508594764811b96a577fc81c5ded34ab0453148
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
(cherry picked from qtcreator/28df27d924bb407791a76de8159c9ffa6efde283)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

cache results of feature search

looking up the same files in the same locations over and over again
is a rather significant waste. in particular, looking up the CONFIG
flags that don't correspond with features has a measurable impact on qt
creator's project loading time.

Task-number: QTCREATORBUG-9154
Change-Id: Ibae3d8b7797e706a6416a7d45c77734ab1281b51
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtcreator/fa27cd79e05aed4ebd16d5648480cc7d48fefd43)

minor optimization: don't concatenate strings needlessly

Change-Id: Iddec1a818ff9f3ad8b12491100883e433e4b8246
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtcreator/12652c20711fd29dcba62b8d5ba71c077d8bd06c)

implement simple VFS to support caching during project parsing

sync up with qt creator.
this counts as a bugfix, because it makes write_file() and cache() do
something remotely useful.

Change-Id: I833253f81c3159056fab2ff888f293b36cc2ef56
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/b215176da34661969015e4950815fe8297885163)
(cherry picked from qtcreator/66802ef8bf7989dc025e34bf91d93576189c483c)

don't unnecessarily use QFileInfo::filePath()

just directly use the filename we constructed it from.

Change-Id: Ia428a2cb4b192fea6bde62dfbf35361bcfc4b21e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtcreator/571234786a3ff7e8e3a9220f12d22a9f74f7a53c)

don't crash if builddir is suffix of sourcedir (or vice-versa)

Change-Id: I97a6e2ebd51350cbf39c86efa5c26a376c49da95
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/b30273ec4a4ce65794fd402c6e3eb21de7bae1b9)

Fix QUiLoader not applying empty string properties.

Introduced by 6b02fc50ec6a5236f628b08ebeca50e62b22f362 .

Task-number: QTBUG-33130
Change-Id: Ida5ac8c3bf043cb04650680a2fc3777eff3b3f3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

prune unused obsolete tests

the code has been absorbed into the proper autotest a long time ago.

Task-number: QTBUG-26510
Change-Id: I199b26331645cea51e91cf9f8be15c3d4628aa7b
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

fix handling of country-less languages like esperanto

it's impossible to instantiate QLocale objects like that, so the
language setting would be simply clobbered. instead, we now convert
between numerical and string codes directly.

unfortunately QLocale has no public api for that. but we are including
private QTranslator headers already anyway, so whatever.

Task-number: QTBUG-14592
Change-Id: I95189c1898aa1fb5520ecf7057521597ed9331f1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

make TR_EXCLUDE work for #include statements as well

Change-Id: I299043c63c6e8b2f24eeee7d3f03a514b96bca5f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

don't complain about missing include()s during cumulative evaluation

it produces simply too many false positives.

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

qtconfig: Update for QFont::removeSubstitutions() renaming in Qt 5

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

Remove unnecessary dependency to qtjsbackend from sync.profile

Change-Id: I48e7799ba86b95e76270b97bc2eecf2c9d36049f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

execute some loops even in cumulative mode

we execute foreach loops now. this is (mostly) safe nowadays, because
a previous change added precautions against exponential value list
growth, so it's unlikely that two nested loops would keep the cpu busy
for a day as before.

we continue to exclude forever loops and loops with excessive integer
counts.

Task-number: QTBUG-8550
Change-Id: Iaa116086986cc7fd5023834753f791dd205102e5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

don't print warnings from parser & evaluator

they are pretty much noise in lupdate context.
we still print error messages: the ones from the parser are always
genuine, while the ones from the evaluator are at least occasionally
helpful.

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

don't print project messages/warnings/errors

they are meaningless during the cumulative parse we are doing

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

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

Conflicts:
.qmake.conf
src/linguist/lupdate/cpp.cpp

Change-Id: Id27ac2ea8438e60a940d4ae3719ad393d7ad88ea

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

Change-Id: Ida20e2ebeb6316e2c6916570ce2e166951af9ee2

Doc: Fix qthelp URL used in Remotecontrol example

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

introduce new message type "vanished"

this state is equivalent to "previously finished, but now obsolete", or
in gettext terms "not fuzzy and obsolete".

this bumps the ts format version to 2.1.

Task-number: QTBUG-12948
Change-Id: I6c89bbfb9b16053b4e1219ec7611cb7a34189d95
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>