Qt Designer Examples: Fix includes.

Replace module includes by per-class includes and reorder.

Change-Id: Id8273865c0110e6d834d9c40a123e3d72bfc4b87
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

Qt Designer Examples: Introduce Qt 5 connect syntax.

Change-Id: I6f0f1fad45412ab3dd7b5ff82f9cab789b805080
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

Qt Designer Examples: Introduce Q_DECL_OVERRIDE.

Change-Id: I08b4227e4609caef74576ea4e05d33c7142f2665
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

Qt Designer: Suppress updating of QAction's object name when editing existing actions.

Suppress the updating on clearing the text for existing actions
that have non-empty names initially.

Task-number: QTBUG-44778
Change-Id: Iedf59d5c8ac2ca356ed86774de677c6faf08afc7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

Fix license text in XSL template used for generating ui4.cpp/h.

Change it back to "tools applications" (Designer/uic) as was in Qt 4.

Task-number: QTBUG-45442
Change-Id: Ib8f4a2310fc4073464b14e45af6981a85be48031
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

Qt Designer: Enable reset property for multiselection.

When working with a multiselection in the property editor, the reset
button was previously only enabled when the property was modified on
the selected/current widget. With this change, reset will always be
enabled when the property is modified in one of the widgets of
a multiselection. Unmodified widgets will be filtered out when
initializing the command.

The intended use case is mainly to enable conveniently clearing all
minimumSize/maximumSize constraints of a form by doing Ctrl+A
to select all and then do reset on the property.

Change-Id: Ideab87cab79e9404941d5594653f12c13515c1ae
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

qtdiag: Add AppDataLocation.

Change-Id: Ia5154a6463a0a5947f8346f18718f0f0027fd89a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

qtplugininfo: Default to printing the metadata in a nicer form

Change-Id: I1a800c709d3543699131ffff13c3801cee682635
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

qtplugininfo: Add some extra validity checks on the metadata

Useful for debugging why a plugin file does not load.

Change-Id: I1a800c709d3543699131ffff13c37f93f85fac1d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

qtplugininfo: Print the plugin name the metadata is from

If there are more than one files passed on the command-line. Like grep.

Change-Id: I1a800c709d3543699131ffff13c37f584d830ff6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

qtplugininfo: Always print the tool name and the filename first

Like moc and cat:

 $ cat foo
 cat: foo: No such file or directory
 $ moc foo
 moc: foo: No such file

Change-Id: I1a800c709d3543699131ffff13c37f0dfdeefc5c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

qtdiag: Add information on touch devices.

Change-Id: Ibe28292df577bf12311b91952df9034b9636589a
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

Doc: make examples visible in Qt Assistant TOC

And in Qt Creator Help Contents, too.

Task-number: QTBUG-45222
Change-Id: I1011242826f227e39768293fc3e5404ba073f17e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

Remove the old headersclean unit test

We have configure -headersclean now

Change-Id: I1817798e76d5bd037c26dad308a22354b9cfd185
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I5a49f9e755d85ea160fcf2ccfbc691ce0c17b458

windeployqt: Add Qt3D module.

Change-Id: Id4a47955a100fad3b22fc12141a8f63057dcbe7c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

Doc: add image path for Remote Control Example

So that it will not be marked "broken" in
Qt Creator examples.

Task-number: QTBUG-41996
Change-Id: I22cd0efc28a46ab99a5d8aee57a5a3f76714d447
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

qtdiag: Update to output values of newly added API.

Task-number: QTBUG-44348
Change-Id: Idda5a09c77d5adca866d3b330292ec10cc549453
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

bic: Add/Replace 5.{0.1,2,3,4}.0 bic data for linux-gcc-amd64

Remove the ia32 data since there are no linux x86 machines in
the CI system (which makes the data useless from an automated
testing point of view) and most people use x64 these days anyway.

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

lupdate: Remove wrong error message

For qsTr(), when string is not literal we printed a warning saying
"text to translate must be a literal string". This was not correct, as
it has never been a requirement for the string to be a _literal_ string.

The solution is to remove the message entirely.

Task-number: QTBUG-42381
Change-Id: If08726143c810382feb0a1c5db5036d9601ce488
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Designer: fix const correctness in old-style casts

Found by GCC's -Wcast-qual.

Change-Id: Ia0aac2f09e9245339951ffff13c95d489992d9ef
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Fix lupdate for .ui.qml files

The context has to be the complete base name including ".ui".

Task-number: QTBUG-44905
Change-Id: If2b148d4ecc790182a7bcc56dd17a33c4ee16617
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Assistant: Fix an export and an import of bookmarks

Use the correct root index for BookmarkModel.
Allow to remove top-level bookmark folders if they were
created by importing bookmarks.

Task-number: QTBUG-44042
Change-Id: I423b141d0e64dec8c4cebfdba0d4401d575d1b96
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>

Fix warning in correct uses of QCoreApplication::translate

It was emitting the warning for "Unsupported Latin1" in the case it was
a valid plural form too

Change-Id: I22c9c15d50488810e3ff5d7b132aebd994b08ebf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Doc: Replace qt-project.org/doc with doc.qt.io

Change-Id: I9f17221f474e06be83a4d9e076746fa3db71d147
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

Fix kmap2qmap build on OS X

Currently kmap2qmap fails to build on OS X (clang) This patch aims to
fix this.

Change-Id: I61c985dc7ad1f2486368c39aa976599d274942ab
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: Ie55561b4d56f23200eda2cc9d2152ae719f2a906

Update/add missing parts to build makeqpf

In its current state makeqpf is not buildable. This patch adds the
missing files as well as update the code to use version 2

Change-Id: Idd35a5db5edeef5523b588b919cebebfcdbeaa27
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Assistant/helpbrowsersupport.cpp: Remove hostile character.

Fix qdoc-warning:
qttools/src/assistant/assistant/helpbrowsersupport.cpp:1: warning: Hostile character 0xbf in C++ source

Change-Id: If565d8af3502504c5e8b9e2ca70fc439a758e9e0
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

Change copyright in version dialogs to 'The Qt Company Ltd.'

Change-Id: I7f1d079dc3714685c4d34fad6c237798ca747b1c
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

windeployqt: Turn off debug/release matching for WebEngine plugins.

Its plugins (ffmpegsumo.dll) are always wrongly detected as debug
builds.

Change-Id: I17ad353a58c90368ab2bc96704016910071f3950
Task-number: QTBUG-44331
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

Merge dev into 5.5

Change-Id: I3bf7a2f27c34ac77198aabcb57f3ad7df5970649

Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5

Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
LICENSE.LGPLv21
LICENSE.LGPLv3
src/assistant/assistant/mainwindow.cpp
src/designer/src/designer/versiondialog.cpp
src/linguist/linguist/mainwindow.cpp
src/linguist/lrelease/lrelease.1
src/linguist/lupdate/lupdate.1
src/qconfig/main.cpp
src/qdbus/qdbusviewer/mainwindow.cpp

Change-Id: I8644f68ff02f00a377f82ea0b7520aa308f0a0df

windeployqt: Fix g++ warning about unhandled enumeration value WinCE.

Change-Id: I2bd95f058c9c03b45ccf43a6f9c6736fed036286
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>

Change creation date to a fixed date

Encoding the dates makes reproducing the output impossible, and doesn't
really have much gain. It most of the time not relevant when something
was built, but more 'what was built' and 'with what tools was it built'

In this case, the creation date isn't read by any thing, so it is likely
just filler data.

Keep the key anyways to not break any third party readers of the file
and set a fixed date, in this case the same date as used for a fixed
date in QtCore's QLibraryInfo::buildDate function at noon.

Change-Id: I560e43dfce538e2f25c3cf51482b946a7cfa179e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

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

Conflicts:
LICENSE.LGPLv21
LICENSE.LGPLv3
src/assistant/assistant/mainwindow.cpp
src/designer/src/designer/versiondialog.cpp
src/linguist/linguist/mainwindow.cpp
src/linguist/lrelease/lrelease.1
src/linguist/lupdate/lupdate.1
src/qconfig/main.cpp
src/qdbus/qdbusviewer/mainwindow.cpp

Change-Id: Icd2e3843fbf9906454e8e3aa3ac46b21bae3c306

Update copyright headers

Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: I7f14f408e04c5c4f73a913fae153adcffbebe38f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/staging/5.4

Remove duplicate expression on both sides of '||'

Change-Id: I09601b4ed4b5d9c9e3e373508f5413d0858bb414
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Merge remote-tracking branch 'origin/5.4.1' into 5.4

Change-Id: Ibde5671a132665726e9a16cdb98bceb9717e45f3

androiddeployqt: Always include platform plugin dependencies

Qt DBus recently became a dependency for the platform plugin,
causing applications to crash on startup when this is missing.
Instead of special casing the GUI dependency, we always add all
dependencies of the platform plugin.

Change-Id: I59d71531f60874ce436af1840656974d58c14661
Task-number: QTBUG-44182
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Revert "fix catalan plural rules"

This reverts commit f1e471b561012f90938766c00aefff417593e71f.

I could not find any evidence that any dialect of Catalan has more than
two plural forms, nor could I find any other software project that gives
Catalan more than two plural forms. I personally have never heard or
seen more than two plural forms used in spoken or written communication.

The CLDR seems to agree with this.

[ChangeLog][Linguist][Important Behavior Changes] The plural rules for
Catalan have been fixed, which will invalidate any existing translations
with plurals.

Change-Id: Id71639a75ec970ee3079b468c2628ced710c1c3a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Alex Henrie <alexhenrie24@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>

linguist: Consistently wrap PO file lines to 79 characters

If the space character is not taken into account, some lines are given
one extra character. This makes Qt Linguist wrap them differently from
gettext and produce unnecessarily large diffs when editing files
generated by gettext.

Change-Id: I310d747a8f455d8ca47e882af04b081e9db25f69
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

MacDeployQt: Handle absolute paths

Correctly compute 'cdupCount' when macdeployqt is
invoked on an absolute path.

Task-number: QTBUG-42954
Change-Id: Id7939610dfb4468b59fcb9dafc2e5da2b578ddba
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>

lupdate: update the description for -no-obsolete option

Change-Id: I164744863d4e3949301ec1f236a76e4ce14decae
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

macdeployqt: fix spelling errors in help information

Task-number: QTBUG-44034
Change-Id: Ie4337dc4770dbe542b3980c6d7265e651de0e88f
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

Doc: linking issues qttools

Added qmake to qdocconf files
Removed link to internal function

Task-number: QTBUG-43810
Change-Id: Ic371681ddff95f09a31b305056997ff76e9c80f3
Reviewed-by: Martin Smith <martin.smith@digia.com>

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

Conflicts:
.qmake.conf

Change-Id: Ifdb0e36fde8a63e1a768f1c876521e908810244d

Bump version

Change-Id: Icaf21350a90d6d2568d76cec4cc1bd5a74eaca7d

Merge 5.4 into 5.4.1

Change-Id: Id1f12a225d975ba3a2c244e90c00126b9e90368a

generate_ui: make the generated code compile for uic

These includes should also work when compiled for designer.

Change-Id: I1705e47f561589b0deec23dc773408835947c1fc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>

Doc: invalid links in linguist

Corrected link to qmake, removed link to lconvert

Task-number: QTBUG-43779
Change-Id: Ieb5bbc0385764bbcff1305ae4f2f2377cf43f464
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

qtdiag/Windows: Output GPU information similar to dxdiag.

Task-number: QTBUG-43263
Change-Id: I348a97a843bcfc2339a06f7408dea72e91d9e0d0
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

Bump copyright year to 2015

Change-Id: I953d93b1e6d1cfe01374645fcb50746c91730eba
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Add qtplugininfo, a tool to dump plugin meta data.

This is useful when debugging plugin loading issues, especially also when
adding additional custom meta data as it's done by e.g. KDE and GammaRay.

Change-Id: Ib1d5d1f663f1330a263fc3758b98245b388b31f6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Doc: corrected title Using Lupdate

Corrected to "Using lupdate"

Task-number: QTBUG-43537
Change-Id: I2edc7a2470f5652b7e0c97705d96ce7f461db6b8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

windeployqt wince adaptions

Let windeploy Qt support wince.

Change-Id: I1835f45e93c1d433b41d78dba8b91ac7be2307c5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Fix build after commit 9d7b27f5bf44a46707e6d50ebf51ecf73f91dd1b in qtdeclarative

The commit integrates the .pragma and .import parsing in JavaScript files
directly into the lexer. Previously the QML engine had a separate function
for parsing those directives and replacing them with whitespace in the source.
Similarly the code here tried to do the same. Fortunately this is not necessary
anymore as the lexer now understands those directives and unless told otherwise
will simply ignore them.

Change-Id: If9888deb2c82a15d1727f4254d897fc9e7bcb832
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

windeployqt: Update plugin directory-module associations.

Change-Id: I15d030b03a759aff3c6b0a3d2eb415684e635a07
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Remove unused functions

Found by Clang 3.6:
assistant/main.cpp:97:1: warning: unused function 'updateUserCollection' [-Wunused-function]

Change-Id: I3fe006504e848914f38b1c481de13b3d10d1059c
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Replace Q_STATIC_GLOBAL_OPERATOR with static

This existed only for working around an RVCT compiler bug. Let's assume
anyone still using that compiler has upgraded to a version that has the
bug fixed.

Change-Id: Iee4e39893b68ea3f8a8d158229a93e741069b617
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

Add missing includes.

After qtbase/90e7cc172a7521396bb2d49720ee4ceb9a9390b3,
QStringList no longer includes QDataStream.

Change-Id: Ib10622b0da3b3450d29fc65dc5356fde75444a8f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

androiddeployqt: Remove unused variable

Just remove a dead variable assignment.

Change-Id: I6034b8a5c462d30449ac7d02b6e6bc1dec109156
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

androiddeployqt: Don't bundle QML files in project

Sometimes qmlimportscanner will generate dependencies on files
local to the QML root path. This happens specifically when
you have an

    import "../"

in one of your files. Since the files in the input project are
already installed in some way, we don't need to include them under
assets, so we skip these files.

[ChangeLog][Android] Fixed bug where androiddeployqt would
automatically bundle some QML files in your input project
along with their dependencies.

Change-Id: I186df8213024100e5e9ee862eadb3ca568fa6dea
Task-number: QTBUG-43573
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Remove qBinaryFind usage from Qt Assistant.

It was omitted in commit 49998cea897fa4c5d410ce07bd53f0d1ee0fd180
(QtAlgorithms is getting deprecated).
Also remove the overload of operator<() which becomes unused with
std::lower_bound().

Change-Id: Iaee3c464e3107c8c3c34def9fa762f22dbd8d510
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

Doc: moved doc D-Bus Viewer from qttools to qtbase

Inserted in patch 102784 into qtdbus-index.qdoc
in qtbase
Task-number: QTBUG-43537
Change-Id: I6142aabe7675dd401de950958d20952e63a3ee4b
Reviewed-by: Martin Smith <martin.smith@digia.com>

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

Remove qtconfig from the repository.

We are not going to build/ship it, anyway.

http://lists.qt-project.org/pipermail/development/2014-December/019545.html

Change-Id: Iad58f384550b2379faebc9542baf94459204c175
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

Assistant: Fix high CPU usage if a parent process finishes

If Assistant has been started in the remote control mode in Linux
and it's parent process finishes, then Assistant increases CPU load
to 100% and continuously raises it's window.
It is because QSocketNotifier for stdin continuously emits
activated() signal although there is no data to read.
So disable the notifier after receiving EOF.

Change-Id: I1b01108e1b97bc4fd54411b16489082be7f47bf4
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

Assistant: Extract StdInListener class from RemoteControl

Also rename StdInListenerWin to StdInListener and select
the needed version during compilation.

Change-Id: I4ef45feee71bae47ef3dfb63e91b7e3154886006
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

Make sure we are using gradle 2.x

Google is playing with my nerves! Android SDK Tools v24.0.0 set gradle
1.x by default, then in v24.0.1 they've switched to gradle 2.x.
Incredibly, a few days later they're released v24.0.2 and again they've
switched back to gradle 1.x as the default gradle version. Thought, when
a project is opened in Android Studio, Android Studio switches to gradle
2.x. We'll do the same thing in androiddeployqt.

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

Solve warning about unused function

The function is unused, but gets used when developers are doing
debugging. So instead of removing it completely, make it inline
non-static.

I've also moved it to a better place, so we don't forget about it.

Change-Id: Id751869e6d6a7d46b4985ef9c09f45661e8cf839
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Remove workaround for RVCT compiler bug

We have no idea if anyone is still using that compiler. But let's assume
that they are using a more modern version that does not have the same
bug that we faced with Symbian in 2010.

Change-Id: I1d25d05d6ecbf531d4942e696470db689c55eeea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

windeployqt: Put translations into subdirectory "translations".

Add translationsDirectory member variable defaulting to
target + "/translations" (matching the default location of
qt.conf) to options and put Qt's and WebEngine's
translations there.

[ChangeLog][Important behavior changes][windeployqt]
windeployqt now puts translations into subdirectory "translations".

Task-number: QTBUG-43351
Change-Id: Ib1173f9dd7ca029d9dcb58c89a53bba43b22ec99
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

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

Conflicts:
.qmake.conf

Change-Id: Ifbda2445e6665d66a1372f6c0a2d0a1c30ae029d

work around MSVC2010 ICE

Task-number: QTBUG-43394
Change-Id: Ifffcc0cf9109b76d79f603a13792d7fd9979761c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
(cherry picked from qtbase/87eb3ea1904756362ce5474838b25b5b00193dc5)

Make sure gradlew has exec permissions on *NIX systems.

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

Doc: Add install path for examples

Several documentation submodules were missing the correct
install path in the doc configuration.

This change will enable the examples to be listed under
the Qt Creator Welcome mode.

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

Designer: Use QWidget::save/restoreGeometry() to position resource dialogs.

Using QRect as was done before might cause the dialogs to be
restored out of screen if a screen is removed from a multimonitor
setup.

Task-number: QTBUG-43374
Change-Id: I48bb6e747da8042a8433d26e5e3bed267126ed3b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

Bump version

Change-Id: Ie1e2dd433215df1037accc0cef807b009272a40c

qdbusviewer: Restore the window size and state on startup

Save the window size, maximization state and state of splitters
on exit and restore these settings on startup.

Change-Id: Ibe26b09cc97ffc2fef17e6e8e2b804324dae7002
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Android: Don't bail out if qmlimportscanner is missing.

If the qmlimportscanner is missing, just print the warning and continue,
as it's most likely that the application is a non-qml application.

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

Assistant: Introduce DEFINES per browser type.

This makes it easier to add additional browser types and
switch between browsers.

Task-number: QTBUG-41130
Change-Id: I88e2890bfe9e815ed7deb9d867060f244b7e2a45
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Alejandro Exojo Piqueras <suy@badopi.org>

Assistant: Factor out web browser support.

Task-number: QTBUG-41130
Change-Id: Ia1d29b6eaa56e0f9eb569326e05f4c56411db6a7
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

Revert "Revert "Revert "Qt Designer: Temporarily disable loading of QDeclarativeView plugin."

Re-enable the QDeclarativeView plugin.

This reverts commit a60aa90f5ca00e32a1271a476f5da650dddebfda.

Task-number: QTCREATORBUG-10273
Task-number: QTCREATORBUG-13616
Task-number: QTBUG-35006
Change-Id: Id8c34e040508f7509501533eceaa75613a46baa8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

Designer: Do not filter out wheel events on form containers.

Otherwise, scrolling with the mouse wheel over the form no longer
works.

Task-number: QTBUG-42927
Change-Id: Ib9022bd3c8e158ca10965602c134415c5c4f7039
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

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

Change-Id: If3345bc6090bac3cddf98c6eed68f47686a3ee75

Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: Icb5b56853c52d51d2cbb294ce9abb5450e2fa2d4

Remove unused private members

Found by Clang 3.6:
messageeditorwidgets.cpp:250:14: warning: private field 'm_wrapee' is not used [-Wunused-private-field]
cpp.cpp:309:15: warning: private field 'yyInteger' is not used [-Wunused-private-field]

Change-Id: Ice6aa515123b1ac375816271362772d50b9b8f27
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Fix silly taking of address when not intended

We meant to pass the boolean itself, noting whether the property
had changed, not the address of the boolean, cast to a bool.

Found by Clang 3.6:
qlayout_widget.cpp:421:147: warning: address of 'this->m_fieldGrowthPolicyChanged' will always evaluate to 'true' [-Wpointer-bool-conversion]

Change-Id: I8a7db0d0cf02b88043f905333e119a8fb799ea53
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: If7b9ae7b6f77025c775e6b654837b5f041f1aab9

macdeployqt: Also deploy framework's Libraries and Helpers

QtWebEngine can't put all its external data in qrc files and have a few
files lying around in the Qt installation. To allow it to be bundled
with applications, those files are now placed into the QtWebEngineCore
framework.

This patch allows Helpers/QtWebEngineProcess.app as well as
Libraries/ffmpegsumo.so to be deployed when macdeployqt is run on an
application linking to QtWebEngine.

This link mention that Libraries is a standard directory:
https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html

This link mention that Helpers is a standard directory for application
bundles, but I haven't seen any mention regarding frameworks:
https://developer.apple.com/library/mac/technotes/tn2206/_index.html

Task-number: QTBUG-41611
Change-Id: I27f662747bd3dff4b9fc8706ecbd2f16f057e857
(cherry picked from commit 5984871db094182b89d2b8e0b142817b227afa4d)
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

New Qt logo

This patch replaces the old Qt logo with the new, flatter one.

The PNGs were optimized via: optipng -o7 -strip "all"

src/assistant/assistant/images/qt-logo.png was deleted since it
is unused.

Task-number: QTBUG-41685
Change-Id: Id04972f87135e15c41d52c5e9f00ad4944d8d1f6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

Merge remote-tracking branch 'gerrit/5.4' into dev

Change-Id: I3492eb21cb47e2a77dc5a79b3ddab8522ac39fea

macdeployqt: Also deploy framework's Libraries and Helpers

QtWebEngine can't put all its external data in qrc files and have a few
files lying around in the Qt installation. To allow it to be bundled
with applications, those files are now placed into the QtWebEngineCore
framework.

This patch allows Helpers/QtWebEngineProcess.app as well as
Libraries/ffmpegsumo.so to be deployed when macdeployqt is run on an
application linking to QtWebEngine.

This link mention that Libraries is a standard directory:
https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html

This link mention that Helpers is a standard directory for application
bundles, but I haven't seen any mention regarding frameworks:
https://developer.apple.com/library/mac/technotes/tn2206/_index.html

Task-number: QTBUG-41611
Change-Id: I27f662747bd3dff4b9fc8706ecbd2f16f057e857
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

windeployqt: Deploy translation files of the QtWebEngine module.

Task-number: QTBUG-42083
Change-Id: Ibc52780c52399ba13cfa5c501b67bd37ea727d1f
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

Tolerate an empty android-extra-libs value

Skip the empty fields in the split. It's obvious that "" means nothing,
there's no other way to read the value.
It especially helps with machine-generated versions of the json files.

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

androiddeployqt: Add --qml-import-paths to help output

This option should also be documented.

Change-Id: Icbcbaea65c839105c8f5a94b5d391bb9e95479ce
Task-number: QTBUG-41494
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

QHelpContentModel: Fix that the model sometimes ended up empty

When aborting collecting the content items, sometimes the "abort" state
was not cleaned up correctly, so the next run thought it was aborted
too. If that happened at the end of the multiple start/abort cycles that
happen at initialization, the content model ended up empty.

Task-number: QTCREATORBUG-13233
Change-Id: Ia47a6b033cc3fd1f7a02d5194fb6f7ea68a435c5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>