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

Assistant: Remove InstallDialog.

Task-number: QTBUG-32390
Change-Id: I160b1a15198a51869716b339bb356eb0740f5adc
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

Qt Designer/widgetdatabase: Remove unused member variable m_form.

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

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

Change-Id: I7ca374a1c97a80238af7d6471626ec8db94a5990

Update Info.plist files for new Cocoa main() call pattern

We would get the following error message otherwise, 'No Info.plist
file in application bundle or no NSPrincipalClass in the Info.plist
file, exiting.'

Needed by I790e5138c29aac2e0215a9147d0148fece40ca22.

Change-Id: I8d2301c41e4957195be8ed5da9a55ab5b02c4608
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

Use QT_HOST_DATA/src to get to the mkspecs.

QT_HOST_DATA/get changed semantic on the dev branch.

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

Add a unit test for testing Qt in its install location.

Change-Id: I01400afbc7ce0d42ce8afb0e87aef70647900228
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

Assistant: ifdef qWarning about missing translations

There's no reason for only assistant to do this, and there are enough
missing translations that a lot of users will tend to see this message.

Task-number: QTBUG-31747
Change-Id: I333d15eaeb603e4c64a1a12791b4f94658b80e80
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>

test: Add 5.1.0 bic data for linux-gcc-ia32

Change-Id: Idad7deea144d5f097158bc17eaff8b871b806c63
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

tst_bic: Remove QtDesignerComponents and QtCLucene data

QtDesignerComponents and QtCLucene are private modules,
so testing for bic doesn't make much sense.

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

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

Change-Id: If58a09c4ed878ed7a1a350036ab1cc2e99a907f1

use designercomponents-private correctly

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

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

Change-Id: I8ced3d911cec321949dd8b160447792ef9bbd3c3

Doc: Setting navigation variables for tools and tool manuals.

-for the navigation bar.

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

Designer: Fix morphing of widgets in QSplitters.

They were not handled at all, children were just reparented
resulting in the morphed widgets being appended.

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

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

Change-Id: Ic056eeec62fbbbf5c932d8e862736f368833f34d

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

Change-Id: I6e22c4ce74e71c41ff43eb0403dab7193df4d0d8

help: print long options with a single dash as well

we simply strip the second dash, so make the doc consistent with the
other tools.

Task-number: QTBUG-24626
Change-Id: I3286808094dc9c64ade821a3db797cb207e0eac9
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Gabor Garami

Add changes-5.1.0 file

Change-Id: I3ade90a360ccece54ac07b1c0c7f71d5bdffc3a4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>

Find the cmake version template in the install location.

Task-number: QTBUG-31153

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

Assistant: Adding 'qtquickcontrolsstyles' to the list of qch loaded.

Task-number: QTBUG-31692
Change-Id: Ie8e4befc75e0a2df9149c1bf028b88b2572e3148
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>

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

Conflicts:
.qmake.conf
sync.profile

Change-Id: Ib2c94071cee5846db9b16ee4d3e9aeb897e9070e

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

Change-Id: I9c98f8277a31aa84e447262ae6745180880d4d2c

Changed contact details

Contact details from qt-project.org to qt-project.org/legal

Used the following command:

find . -path '*/3rdparty/*' -prune -o  -exec grep -ilI -E
'.*Copyright.*Nokia.*|.*Contact.*' {} \; | tee
>(xargs sed -i -r '1,50 { /INdT|copy[a-z]*[ ]*=/ !{
s/(^[ \t:#*;/"\\-]*)([a-z ]*)(Copyright.*Nokia.*)/
\1\2Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I
}}') >(xargs sed -i -r '1,50 s/(^[ \t:#*;/"\\-]*)
(.*info@qt\.nokia\.com.*|.*INSERT EMAIL ADDRESS.*
|.*qt-info@nokia\.com.*|.*qt-label1@nokia\.com.*
|.*http:\/\/qt\.nokia\.com\/contact.*|.*qt-sales@nokia\.com.*
|.*http:\/\/www\.qt-project\.org\/.*)/
\1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs
sed -i -r '1,50{/(^[ \t:#*;/"\\-]*)(all rights reserved.*)/Id}')

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

Doc: Rename Qt Designer license information page

Rename the license information page to a more generic one, and list
licenses for individual contributions under it.

Task-number: QTBUG-28536
Change-Id: Ia88d99640ab23837f4db2a820fc95c9318d3b365
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Bump MODULE_VERSION to 5.1.1

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

make error() abort the qmake run, not just the current file

sync up implementation with qmake.
this doesn't actually have an effect on lupdate, as error() is disarmed
in cumulative mode.

Change-Id: I82fc55680f9ffb227e25acb39c797596225ba89e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/0da7f097249f71726140a38647bb4824b09fad7b)
Reviewed-by: hjk <hjk121@nokiamail.com>

add ProFileEvaluator::resolvedMkSpec()

sync up implementation with qtcreator.

Change-Id: I9408541a09a6a687fdbae879bd1ab4c92e62aa1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from qtcreator/867d655278398561c2bfe879e42062f93ae85453)
(cherry picked from qtcreator/7d4e3b7b4c69c9bcc42aa278ce91f4188fc06534)
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

excerpt from "Qt4Project: Do a build_pass evaluation"

sync up the implementation with qtcreator

Change-Id: I3673dd93b37b10102a0c1f1ce053e1aef8aaf53f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtcreator/95169eb8e39c6f43b7e74fbb18d4db19a38b0124)
Reviewed-by: hjk <hjk121@nokiamail.com>

QMakeEvaluator: Set pro file as source for internal variables

Task-number: QTCREATORBUG-7006

Change-Id: I3f599f92d03b6f9fdf65b12cf4090e28cc497fbd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtcreator/6e3af2bf2e2833e0ecbc9b366af8e06abd7ecf96)
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

update size calculations for assignment statements

this was forgotten when the value lists were extended by a size hint.

Change-Id: I6f9b55ed671224a9b8735c8d937f94aac4a73a42
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
(cherry picked from qtcreator/f24c9865306624c2fc150d4bd262a5c4d5a3689a)
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

add missing ifdefery

sync up implementation with qtcreator.

Change-Id: I6a1578818512fa3b0773faf276a1d56881eb06d7
(cherry picked from qtcreator/0ad234b691aafedd5b78669780220334b951b045)
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Fix warning

Warnings came up using MinGW 4.4:
* qmakebuiltins.cpp: 'QString windowsErrorCode()' defined but not used
[...]

Change-Id: I80827f7f740ff380f13cef96d6b43baaa7e179cb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/81f4ecdd7920ffcec4244bf70a0aedf4fbfb66e3,
 (cherry picked from qtcreator/0e13cf3faffc7463ae2bf535dfdb008202112cc4))
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Fix Krazy warnings about includes/header guards in proparser.

Change-Id: Ie0067544492a207255a3ff3f43d95d2976c73c5e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtcreator/80011dde399cfa43372dd23ff1b1f12afa4b7938)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

fix warning in ProStringList_join

Fix C4267 MSVC warning.
Make sepSize an int, because this function is never called with a size_t.

Change-Id: I2b834fe7c1408e34d55d9f137231e2f5816f3f1d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/98a73e16012f75934ce4b6e4c85fb4d6a2ad0a28)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

Fix combobox not opening in treeview item delegate editor

This is the same fix as for QTBUG-30715, which leads me to think that
we should spend some more time and re-think how QComboBox gets focus.

See also qtbase 3b992f831.

Task-number: QTBUG-31298
Change-Id: I4393af00c8896051e9ed8b5d8af510633106913c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

sync.profile: Point dependencies to an empty string

This means that we are going to use the same branch name for the
dependencies as the branch of the repository under test.

If we are testing the 'stable' branch, all dependencies will point
to the 'stable' branch as well.

Change-Id: I527d529456fba47fcb4e48c1129612d620878f0a
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>

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

Change-Id: I4556ce5965020154a563cef9613305cafae3c674

Fix assistant and designer builds without printer.

The actual code using printer related classes is already wrapped with
QT_NO_PRINTER macros, but the include statements were not.

The reason why include statement probably were not wrapped with
QT_NO_PRINTER is that in Qt4 all headers were synchronized to include
directory. Now with Qt5 modularization headers for modules which
are disabled are not anymore synchronized to include directory so
they need to be wrapped with same ifdefs.

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

Add missing documentation sets - still hardcoded  :(

Task-number: QTBUG-31107

Change-Id: I517974a937baaa0371357bb7791d86b26f853049
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

QtGradientEditor: Fix compiler warning about redefined macro

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

Designer: Remove unused typedef

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

Fix gcc warning about unused code

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

Qt Designer: Fix help URL to point to qdesigner-manual.html.

Change-Id: I59a14c7f2a2c770b4b67a2af5c4d5542519f0d63
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

create a .qmake.cache for the lupdate tests

mac mkspecs are really noisy without it now, which makes the tests fail.

Change-Id: I6b4900c51d0b8aedd9309482a30055e48c3b9f69
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

make stubs for dangerous/useless qmake functions in limited mode

instead of having them "not implemented" (and consequently getting
errors), just let requires(), system(), mkpath(), write_file(), touch()
and cache() do nothing. this is likely to cause followup failures which
are harder to detect, but the amount of scary noise we are producing now
is not really acceptable. furthermore, in qtcreator these failures
actually terminate the "precise" evaluation, which breaks Run
Configurations.

Task-number: QTBUG-28159
Task-number: QTCREATORBUG-8550 (in different repo)
Change-Id: I1bdeb759e895e4200f09332dadf8a6cef348182f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

don't send output of $$join() and $$sprintf() through split_value_list()

in the case of sprintf it's surprising, in the case of join it's
anti-thetical.

Change-Id: I4eb7e56d31ac6ed68adf852f1a19b33554d38eb4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/ae94bf2b7a6373def9239ae5f54b143e1f6ffe09)

clean paths of found files in prepareProject()

any of the directories may be the root, which would lead to double slashes
in the constructed filenames.

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

make split_value_list() mostly sane

don't count parentheses, don't nest quotes, don't create empty elements.
the backslash still escapes only quotes (and itself) - $$list() (one of
the main users of this function) is commonly used with (windows) path
lists, so letting it escape anything would make a royal mess.

Change-Id: I29252fbe14fd6d28217450ec41cf8acfb2e30681
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/6c22b9b3e86d1617665f7b81b105c032f43c6d72)
(cherry picked from qtbase/a5c2ab47867a558d6f8f62126fb8e4f2777cfe06)

permit returning from files

this allows skipping an entire feature file if a condition is not
fulfilled, without putting the whole body inside a conditional.

Change-Id: I84fe9c94dda58c794fb52c3f163b40563b0db30a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/525eb337670f61078383c20ad9be274dcf2d0928)

remove pointless initialization of qmakespec

we have proper fallback paths further down the line.

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

Update feature paths on assignment to QMAKE_PLATFORM

Instead of after parsing the makespecs, were we assumed QMAKE_PLATFORM
had been set by the makespec and did an explicit update.

Allows loading platform specific features from within a makespec after
updating QMAKE_PLATFORM.

Change-Id: I0eb3b7fb88ce48b00a384850c5d87223c06234d7
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
(cherry picked from qtbase/4dd29248cd43ff730f7432b51a443b72fad3523d)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

remove automatic splitting from $$() expansions

$$(FOO) would automatically split the contents of the environment
variable at whitespace (and interpret quoting inside it). the way to
prevent the splitting (but not the quote interpretation) would be using
"$$(FOO)".

this behavior is entirely unexpected and thus an incredibly effective
source of quoting problems - according to a grep over the whole qt
sources, there isn't a single case where things were done right. in qt
creator, well over half the cases are wrong.

also, the "feature" seems entirely pointless: nobody uses spaces as
separators in environment variables.

consequently, simply remove it, even in a patch release. i'm postulating
that nobody will complain.

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

don't pretend that break()/next()/return() are functions

it's a pretty braindead thing to implement control flow statements as
(built-in) functions.

as a "side effect", this fixes return() value handling for lists.

(cherry picked from qtcreator/f53ed6c4b3feca59a94d4f0de8b1a7411122e30e)
(cherry picked from qtcreator/f529e22ec38fb9a656d74394e484d2453cf42c69)
Change-Id: I59c8efa0e4d65329327115f7f8ed20719e7f7546
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from qtbase/8400896cfe3fbef7666329a2920bd0dbdd5890af)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

improve parse error recovery paths

to reduce collateral damage from parse errors.

(cherry picked from qtcreator/00c0d0d5e42d28e03c2846c17d3acbcd8420859d)
Change-Id: Ic59700d657069d3b15372509b4bff966057d27a9
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from qtbase/ae3f95a951334dee001e37c305e4d7bf91c0d1b3)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Android: Fix for compilation error in clucene.

Android only provide stubs for wcstoll(3) and wctomb(3), to solve this
wcstoll(3) is replace by an internal equvialent, and wctomb(3) by
wcrtomb(3).

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

make use of qt_app.prf

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

adjust to new "configure -nomake tools" semantics

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

remove pointless INCLUDEPATHs

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