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>

parallelize SUBDIRS

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

remove pointless mac scope

this subdir is only entered on mac.
also, if this scope was actually skipped, the result would be rather
unexpected ...

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

remove pretenses of building kmap2qmap

the 'embedded' scope (qws) is dead.

Change-Id: I4942d90eac9583787610ed3217145240fa89693f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Improve warning message about code being auto-generated

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

Fix trailing whitespace issue in ui4.cpp generating xsl

Fix the line responsible for generating the trailing whitespace in the
qtbase/src/tools/uic/ui4.cpp file.

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

remove pretenses of building makeqpf automatically

the 'embedded' scope (qws) is dead.

makeqpf is a graphical host tool to be used in the process of deploying
embedded software. as the qt build system does not support such a
configuration, the tool simply must be built manually.

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

Update README: it's not 2008 anymore

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

Make linguist's source viewer read all files as UTF-8.

It currently loads source files as latin1, which means unicode
characters are not supported.

4944ea0586 removes -codecfortr and hence the ability to specify an
encoding. lupdate will then treat all code as UTF-8, so this patch
does that too.

Task-number: QTBUG-27238

Change-Id: Iefed45de5b4925fee267834a5ed93457fc45b700
Reviewed-by: Debao Zhang <hello@debao.me>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Doc: remove help output from the Qt Linguist Manual

This is difficult to maintain and users always get
the up-to-date information by executing the help
command.

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

Doc: describe translation sources in Developer topic

Move information from the Release Manager topic and
add information about QML sources in the Qt Linguist Manual.

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

Doc: remove details about i18n from Qt Linguist Manual

Add links to topics that describe i18n in detail for
C++ and QML.

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

Doc: rewrite Translators topic in Qt Linguist Manual

Make the topic task-oriented. Move information around and
remove redundancy. Check the paths to commands and availability
of commands. Make docs reflect some changes in functionality.
Remove images of toobar buttons that are no longer referred to
in text.

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

Doc: replace "balloon help" with "tooltips"

In the Qt Linguist Manual.

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

Doc: add link to Internationalization with Qt

To the Qt Linguist Manual.

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

Fix plugin export macros in Qt Designer documentation.

Use Q_PLUGIN_METADATA instead of Q_EXPORT_PLUGIN2 .

Task-number: QTBUG-30508
Change-Id: Iedc1e140d3f597e29911a38e5d5548e6ac9981b3
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Doc: move release management task list in Qt Linguist Manual

Move the description of the release process from the Developer
chapter to the Release Manager chapter.

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

QUiLoader/Designer: Fix gcc 4.8 warnings about unused typedefs.

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

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

Conflicts:
src/assistant/assistant/assistant.pro

Change-Id: I7ca59c8150a591c7e2ba57fd729421b4dba064d0

Assistant: Fix static linking on Windows.

Check for existence of sqlite-plugin.

Breakage introduced by d73afeeafc7df8192508c1a5617944d303d5a0a2 .

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

Generate the Qt5LinguistConfig.cmake files independent of QtUiTools.

The generation relied on the uitools module for the version, so
if it was not available, we got errors like this:

 WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake'
 WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake'
 WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake'

 http://testresults.qt-project.org/ci/QtTools_stable_Integration/build_00128/linux-g++_no-widgets_Ubuntu_12.04_x64/log.txt.gz

Use MODULE_VERSION for the version instead and MODULE_BASE_OUTDIR for the
generation location.

Change-Id: I9daa6878553015e841b6e41fd1f64eb60ada7774
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

Assistant: Fix static linking for Linux.

main.cpp:78: undefined reference to `qt_static_plugin_qsqlite()'

The import for the DB plugin should now be generated by qmake.

Change-Id: I9da25aea8667ca34221427236b8e1d36be77da8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
(cherry picked from commit f212e46fe930ee89a8cb52beeeccc03369c015a1)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Bump MODULE_VERSION to 5.1.0

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

Doc: edit Qt Linguist Manual for style

Replaced "e.g." with "for example" and "etc" with
"and so on". Removed contractions. Removed some extra spaces.

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

Doc: move Qt Linguist overview information

From front page to a separate topic.

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

Add changes-5.0.2 file

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

Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: I359d5bfaa62a4d37a2deec79f80963ae5c19d918

Assistant: Fix static linking for Linux.

main.cpp:78: undefined reference to `qt_static_plugin_qsqlite()'

The import for the DB plugin should now be generated by qmake.

Change-Id: I9da25aea8667ca34221427236b8e1d36be77da8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

make lupdate a host tool

lupdate makes no sense on x-built targets at all.
though one may also argue whether it makes sense to actually bootstrap
it - while its use may be supported by the build system, it's typically
not part of regular builds, but rather used shortly before running
linguist - for which a host build of qt is necessary anyway.
one argument for bootstrapping is that it uses the qmldevtools library,
which logically should be bootstrapped (the only other current user is
qmlmin, which definitely *is* used in regular builds and thus needs
bootstrapping).

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

make lconvert a host tool

it's a build tool, so it should be built for the host.

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

make lrelease only optionally bootstrapped

qt_tool.prf handles the magic for us.

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

fix translation contexts

the bootstrapped library now fakes the translation api sufficiently
well to enable unifying the usage.

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

support only utf-8 and utf-16 for source code

utf-16 is optionally used by java and msvc. it doesn't hurt to support
it. all other encodings are not used anyway (other than 8-bit
pass-through, but this is a matter for (the also removed) CodecForTr).

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

Run the qttools cmake module tests only if QtWidgets is available.

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

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

Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879

Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

Remove qaccessible2 bic data.

Change-Id: I629046a2a7aa0611cda4f04f8d6253d5db4e05a3
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>

Install the Qt5LinguistToolsConfigVersion.cmake file.

Change-Id: I8f14f79c1e8e17816d63303f130773780547346a
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

purge CODECFORTR & -codecfortr support

qt-based code is expected to be utf8-encoded nowadays. the respective
c++ interfaces have been purged in 5.0 already.

Change-Id: I592b49f198aae05212afbf8d3aa2b01b1e9369dd
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

purge ui3 support from lupdate

there is no qt3support in qt 5 any more.

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

purge TS 1.1 support

at the time of release it will be almost five years since we introduced
TS 2.0 and stopped writing 1.1 by default, so there shouldn't be much of
a need to write such files any more - and this commit doesn't even
remove 1.1 reading capability (because it comes for free so far).

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

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

Change-Id: I4c19a5f76b8605134aeab29130a20df187f8f107

Aero-Style-QWizard: Remove special handling in Qt Designer.

The wizard now behaves nicely when used as a child widget.

Task-number: QTBUG-29904
Change-Id: I2e9705eb4197b3411c9e072d0d5c05a97df8d47f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

List supported file formats in search indexing.

The supported file formats is implemented in
QHelpSearchIndexWriter::indexableFiles() function.

Task-number: QTBUG-30110
Change-Id: I4b68d765da6769b52b74f7fa4fbc1a1bcbfd4e08
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Fix warning about superfluous parentheses (CLANG).

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

Qt Designer: Remove unused code (detect by CLANG).

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

Enable Active-X plugin in Qt Designer.

Task-number: QTBUG-29733

Change-Id: I290c476d1ba84ca6ff519aa9d437d28e4ea066d8
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

Fix moving widgets in horizontal layouts in RTL mode.

Task-number: QTBUG-25872

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

Active X plugin: Fix setting a control by task menu.

The property is a QString when set by the menu or a
PropertySheetStringValue when loading the form.

Breakage introduced by
8695c1753964eeb06b5d9306010b56be5fc151c0 .

Task-number: QTBUG-29234

Change-Id: I84c3de80b99c8a20aaf1f8f7289882b0092d6a0a
Reviewed-by: Andy Shaw <andy.shaw@digia.com>

Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

HTML improvement

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

define MODULE_VERSION

Task-number: QTBUG-29838
Change-Id: If7a85b5bf9701b1f804091b645b7de6554d4a27d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

Use qmake for package dependency resolution in cmake tests.

This allows us to remove hardcoded depends information.

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

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

Change-Id: Ic736c7169dc07599f43ee8317cca78da42131e1a

nuke sharedcomponents.pri

it doesn't actually do anything useful for quite a while

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

Merge branch 'stable' into release

Change-Id: I29715c906d4d4dee985fdcfbae9a5d99c1a17997

Rich text editor: Add support for Right-to-Left blocks.

Task-number: QTBUG-9502

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

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

Change-Id: Icc911c4f334091c0e1ece149ac68fab25ca07bd0

Add license files mandated by (L)GPL.

Currently only qtbase includes the required LICENSE files, which
are referred to from the code headers. The same files should
be distributed as part of all the modules as well, so that the
(L)GPL licenses are adhered.

These files were wget:d from:

https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL

As an addition to above, added also LICENSE.FDL. All the modules
additionally require it, since they include at least *.qdoc files and in
some cases a couple of others.

File received via
wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL

Change-Id: Ia9dd91fb4defea000d3df79006eba65e549a99e1
Reviewed-by: Jason McDonald <macadder1@gmail.com>

Add Linguist comments to palette editor preview widget.

Change-Id: Ib2cffaddacdddcc84070310a7f8e7c387ef3972a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

Remove QPointerBase bic check.

QPointerBase is not public or exported and it is to be removed

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

Doc: Edited Qt Help page and clarified .qhp file location.

-replaced "html" with "HTML"
-noted that the .qhp files are in the HTML directories

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

Ctrl+W shortcut on last open tab causes Assistant to crash.

Task-number: QTBUG-29499

This happend as nobody did inform the menu about the page changes,
the shortcut remained active even for the last viewer. Also make
some constructors and functions private, so we can no longer mess
from the outside with the viewers, except thru OpenPagesManager.

Change-Id: I2675996d4b30ab8b1db657e5157b497a73b96196
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Fix CONFIG of tool-plugins.

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

QMakeParser: save one ByteArray construction

Change-Id: I2845fdefb8b32de227f08017e0e3ad98923d1c87
Reviewed-by: hjk <hjk121@nokiamail.com>
(cherry picked from qtcreator/52be02d1cbbf69d4f82c517c7b633ed3d13b1007)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Remove braces for single lines of conditions

#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from qtcreator/29a93998df8405e8799ad23934a56cd99fb36403)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

fix doc page urls

they are versioned nowadays

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

Do not use webkit in case of static build.

Since linking against a statically build qtwebkit fails, fallback to
use QTextBrowser. I guess we need to fix static webkit builds first.

Change-Id: I1bc6c1ae70f0e57fa179a3ffe8750bde97809d12
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Qt Designer: Fix message about file open failure.

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

substitute fixed version numbers in qdocconf files with variables

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

support alternative and multiple suffixes in $$resolve_depends()

this is undeniably a new feature, but it's needed for a bugfix.

Change-Id: I951a3128eb580404ee0c7e3cdcb4d6170e899f70
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/87054805872429c1c17135f9ae5364b050d3fdff)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

don't flush qmake command line twice

otherwise variable assignments (including -config options) from
$QMAKEFLAGS are lost.

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

qmake:Add a case sensitivity flag to ProString::{starts,ends}With()

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

add base parameter to ProString::toInt and ProString::toShort

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

Merge "Merge branch 'release' into stable" into refs/staging/stable

QtDBus-tools: Remove module includes.

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

Merge branch 'release' into stable

Change-Id: Ib896ae10a70d72eb671edba52ad29a1f7c8a73a7

Look into the right variable to determine whether Qt is built statically.

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

FilterWidget: Fix valgrind warning about uninitialized variable.

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

Fix crash (QFont access) by using a qt gui application.

Task-number: QTBUG-29218

Change-Id: Id7a926dce61cfac2a8c67ffaee52d305604cb34f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Remove QT_{BEGIN,END}_HEADER macro usage

The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.

Change-Id: I208ae87694deeb4edc73bb1a4be314c30861910f
Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>