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>

complain about missing sources in id-based messages

i considered making this optional on the basis that the source strings
may be assigned externally, but in that scenario lupdate wouldn't be
used to start with.

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

fix strings from #included sources not being collected

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

make TR_EXCLUDE work for SUBDIRS

this is needed for excluding subprojects we have no direct control over,
e.g., git submodules.

note that unlike TR_EXCLUDE for files, this matches SUBDIRS entries, not
actual project file names. wildcards also work, though.

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

use correct AND operator

amends 066b08fc62 and e1f3732197

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

purge pointless QT_DISABLE_DEPRECATED_BEFORE=0

neither the tool test code nor the lupdate test data need any of it.

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

build without QT_DISABLE_DEPRECATED_BEFORE=0

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

CMake: Use path manipulation features from qtbase.

The qtbase commit 4ce32f66 (Use new path manipulation functions
from qmake., 2013-01-18) used new qmake functions for path manipulation,
and commits 7ac58d1f (Make cmake packages installed to /usr
non-relocatable., 2013-02-11) and 5aa34962 (Handle usr-move without
forcing absolute paths, 2013-04-17) added handling of symlinks which
would otherwise break relative path calculation.

Port those patches to the qttools cmake files.

Task-number: QTBUG-32570
Change-Id: I7d22609c3a03be4b9197dd030d7e9bd6c2e04731
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

remove dead files

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

don't ignore changes to meta data when updating translation units

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

reshuffle the code for clarity

less spaghetti, less nesting

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

de-duplicate extra comments when adding a message multiple times

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

update all data of existing messages in extend()

when the message identifier (msgid or context/source/disambiguation)
appears in multiple places, the remaining meta data may be inconsistent
between the occurrences. we need to handle partial data on one hand, and
contradicting data on the other.

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

avoid false positives when looking for magic comments

expect meta data only at the beginning of statements.

this required syntax fixes in some unrelated autotests.

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

make comments not confuse the c++ parser

comments can appear pretty much everywhere. consequently, handling them
as proper tokens is rather tedious (and was of course not done
consistently, leading to numerous bugs).

so take them out of the token stream and handle magic comments "in the
background".

this necessitates that we use match() a bit more sparingly, as we must
not call getToken() after a "tr()-terminating" token too early, as it
might erroneously collect subsequent magic comments too early otherwise.

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

cancel complex constructs at end of #define

it's possible that we encounter the end of a #define statement while in
the middle of a complex construct (which is part of a macro, obviously).
we should discard those, as otherwise Weird Things may happen.

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

micro-cleanup: exit directly upon unexpected eof

there is not much point in going on.

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

remove pointless additions

yyWord is always empty at this point.

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

don't claim that single slashes are comments

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

Doc: Set the \module pages' \qtvariable.

-Tells QDoc the module's QT variable value

Change-Id: I91cbaa6eb75ea181dc1b049d92a8acd97cbf1344
Reviewed-by: Martin Smith <martin.smith@digia.com>

fix handling of c'tors with namespaced parent classes

this is achieved by setting yyTokColonSeen under much narrower
conditions (when we are pretty sure that we are seeing the start of a
c'tor's initializer list), which allows us to unset it under much
narrower conditions (when we are pretty sure we are seeing the start of
the c'tor's body), so we now actually *do* skip over qualifications
which would confuse us.

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

clear prospectiveContext after "consuming" it

otherwise it would trigger useless assignments later on.

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

make QT_TR_NOOP work in static initializers, take 2

simply ignoring equal signs turns out to be not so smart: there are
static initializers without braces, which consequently do not look like
function definitions with a weird additional char.

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

ignore bracketed expressions only outside function scope

static initializers obviously cannot appear in scopes, so there is no
reason to suppress parsing tr() statements used for indexing inside
functions.

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

avoid infinite loop on unterminated bracketed expressions

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

adjust to qHash(QString) returning a full int's worth of bits in qt5

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

lupdate: Fixing decoding of QML files

Decode text stream from QML files as UTF-8 even when the latter
is not the default system encoding (QML supports UTF-8 only).

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

don't complain about non-EEXIST io errors twice

simply use the new parser flags to report all errors directly.

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

complain about absent files to -pro argument

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

avoid boolean argument trap: introduce QMakeParser::ParseFlag

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

Linguist: Set windowTitle in form preview.

Task-number: QTBUG-26868
Change-Id: I065d17cbf3c4426f3ba95b8c8f999f181af4b062
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Move uiloader test from tests/auto to tests/manual

 - bring tst_screenshot test back
 - make tst_screenshot compile
 - make tst_uiloader compile

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

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

Change-Id: I4ad3ca66f63476974bdfcadcff373179715a34d2

Fix compilation when QT_NO_PRINTDIALOG is defined

Seems like QT_NO_PRINTER does not imply QT_NO_PRINTDIALOG,
so both need to be checked.

Change-Id: I164e602e75ebb524a33cfacaad68023e33f8978f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Bump MODULE_VERSION to 5.1.2

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

Fix CLANG-warning about unused variable q_ptr.

Change-Id: Ife2e8d38059dfff33f544587f8a8b6f6c8bc2a8b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Add deployment documentation for translations.

Task-number: QTBUG-28766

Change-Id: Ibc1b71fde39d344167f7dcecba81e2618c3e4e97
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Add changes-5.1.1 file

Change-Id: I7254379bc54c5aa562fd13b44f66d245244c4d6a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

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

Change-Id: I5368a3b3212af59ac5b95bc56c667b0d3392078a