Port Qt Designer to Qt 5 signals & slot connection syntax.

Use Qt 5 signals & slot connection with exception of private
slots and tool classes from the shared directory.

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

Qt Designer: Disambiguate signal/slot names in action editor.

Classes ActionListView/ActionTreeView overload the signals/slots
of the item views they inherit with action parameters, making
porting to the new signals&slot connection syntax unnecessarily
difficult. Change the names to contain the word action.

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

Don't pass int by-ref in foreach

Change-Id: I78753657aed14969fc35614ffba7cf480609c7de
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

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

Conflicts:
.qmake.conf

Change-Id: I2424cf97743b3f998bf7b10a21f8075ed76b613f

Bump version

Change-Id: I97bd7a6de4a0fa51789c0cee8cf0703e32429f6f

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

Change-Id: Idc7ad0119c9b37908fc432b31163a9b9e8f45734

Linguist: bring currently translated widget to front

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

windeployqt: Fix MSVC debug/release detection for WinRT.

Change 6c8954b07807e31dbc8967ba6d92d4d022073087 caused WinRT modules
to be detected as release always since the runtime libraries there are
called msvcp120d_app.dll / msvcp120_app.dll. Change the algorithm
to check on the first character after the version number.

Change-Id: I7eb645e9b94f21dd8daaf24f59009cc9c6f18c4c
Task-number: QTBUG-46629
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

macdeployqt: Fix rpath setting for additional executables

Additional executables can lie anywhere within the app bundle, so we
have to individually calculate the corresponding rpath instead of hard
coding to @loader_path/../Frameworks.

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

windeployqt: Fix broken deployment of ANGLE.

Commit 48b5cb2e682fd58e60b5650366c0291020e8b264 (windeployqt: Add support
for x86 based WinCE) broke the if condition as revealed by g++:

main.cpp: In function 'DeployResult deploy(const Options&, const QMap<QString, QString>&, QString*)':
main.cpp:1189:77: warning: 'and' of mutually exclusive equal-tests is always 0
     if ((options.platform & WindowsBased) && !(options.platform & WinCEIntel) && !(options.platform & WinCEArm) && !qtGuiLibrary.isEmpty())  {

Change-Id: I91e8d4b93b1060330bff883f5eaa4eacc27e474f
Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

Add auto test for windeployqt.

Deploy test application and launch in clean environment
with qt.conf to verify that deployment works.

Task-number: QTBUG-46629
Change-Id: I3b73354b95e7e5c55c8f30991fbc9f7443176079
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

windeployqt: Detect -release -force-debug-info MSVC builds as release.

Factor out detection logic into a template for 32/64bit.
When a debug entry is detected, detect release if the
library positively uses the release runtime dll.

Task-number: QTBUG-46629
Change-Id: Ic34c2e3850e7f1945086da87867934c502026a2e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

qtdiag: Add new capabilities/style hints for Qt 5.5.

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

Add missing private headers warning

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

windeployqt: Print warning when MinGW runtime cannot be found.

Task-number: QTBUG-46458
Change-Id: I102eb6b902e9f59e7abacae611b5ad32dbe64eeb
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

macdeployqt: fix plugin deployment.

Set deploymentInfo.deployedFrameworks again, which
was accidentally removed by ad31b989.

(The plugin deployment logic uses deployedFrameworks
to determine which plugins to deploy.)

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

Fix CLucene compile error with VS 2015.

Task-number: QTBUG-45961
Task-number: QTBUG-45976
Task-number: QTBUG-46344
Change-Id: Ic001298e96ae474a4939c445b7816a331135dd53
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

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

Change-Id: Ie29b7ff968808d1cca2864016445bc1c973a124f

windeployqt: Add support for x86 based WinCE

Adapt windeployqt to support x86 based WinCE systems
in parallel to arm based WinCE systems.

Change-Id: I855db447524ebc55c68af5eaecbf9f6a448d9ed8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>

Qt Designer: Disambiguate the modules where widgets come from

- QWebView is from "Qt WebKit Widgets", not "Qt WebKit", "Qt WebView" or
  "Qt WebEngine Widgets"
- QQuickWidget is for Qt Quick 2, not Qt Quick 1

Change-Id: Ifd3395cbbe632b0d17b37658044318ddf04770c9
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Linguist: do not override the roles of Edit menu items

The menu items were staying disabled whenever the File dialog is open,
so it was not possible to use them to cut/copy/paste into the native
FileDialog (or its child sheets) on OS X.

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

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

Conflicts:
.qmake.conf

Change-Id: I47fe486745efad44537255a56087f4ec0a3b2e82

Fix the include for QQuickWidget

Task-number: QTBUG-46139
Change-Id: I499b2fdaaf2ca72350a83a5a8a75eac94f0bcd76
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

Fixup "androiddeployqt: Use correct package name when uninstalling"

This partially reverts commit 30329ce24004a54e0bd1bbeff2b139ab13bb6946,
making sure that updateAndroidManifest() works as it did before.

Change-Id: Ia6c28985224ffaa36063e7195e32864c4ce0b67e
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>

Updated WinRT license headers to use LGPLv3 instead of LGPLv21

From 5.5.0 -> WinRT port is licensed with LGPLv3, see
http://blog.qt.io/blog/2015/04/29/windows-10-support-in-qt/

Change-Id: Idd2bd07705a9ccdc80d22e896acc42141a96d3ee
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>

Qt Designer: Fix widget box settings.

The group name was used with incorrect case, which
no longer works in Qt 5/Linux.

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

Qt Designer: Update widget box labels

- Use correct names for 3rd-party technologies ("OpenGL")
- Use appropriate capitalization ("MDI Area", "Key Sequence Edit")
- Make labels as similar to the corresponding class names as possible
  (QDialogButtonBox, QCalendarWidget)

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

Qt Designer: Introduce Q_DECL_OVERRIDE.

Replacement done by a script and verified with clang 3.5 to not cause
new warnings.

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

Update Qt Designer documentation.

- Document new QUiPlugin module.
- Fix example documentation to reflect the changes in
  the qmake variables (QT/CONFIG).

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

MacDeployQt: handle "./" in app bundle name

Use QDir::cleanPath() to normalize the app bundle
path.

Change-Id: I35053507dd11de986b9f43276e41d9fe3eff0fca
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>

androiddeployqt: fix possible infinite loop.

Change-Id: Id9965521f69c999a417d2b1f54b49b145dd4f32c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

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

Change-Id: Ice083b71518d645bf411f1275826e928df797242

Test the Qt5UiPlugin cmake module with CMake 3.0.

Test that the forwarding headers work when using the QtDesigner module it
was extracted from.  Test that transitive usage requirements of the
Qt5::UiPlugin module are available through the usage of the Qt5::Designer
target when using CMake 3.0.

Change-Id: I200b5cf111f0160be2504727ab4111ce8a1d6170
Reviewed-by: Stephen Kelly <steveire@gmail.com>

move ui loader interfaces to own module

it's backwards to declare the interface as part of the designer library
itself, as that obviously pulls in half of designer itself into custom
widget plugins which should be perfectly usable from the stand-alone
ui loader in uitools. also, designer isn't built for embedded systems,
so the bundling needlessly limited the availability of widget plugins.

so move the relevant headers into a separate include-only module.
the designer module retains forwarding headers, as the old includes
obviously need to continue working.

[ChangeLog][UiTools] Custom widget plugins should now use QT+=uiplugin
instead of QT+=designer. This makes them usable on embedded systems.

Task-number: QTBUG-44724
Change-Id: I5535b10d2f095b257eeda9681f60b2f8c699f7d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

fix exported dependencies of uitools module

move the include which declares the correct dependencies to a place where
qt_module.prf can see its effects.

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

remove extension.h duplicate

it was there only because uilib used to temporarily live in qtbase.
however, the header's inclusion into customwidget.h was pointless in the
first place, so just nuke it.

Change-Id: I85b89e397e4393987192de05ec74e8c2328d2b32
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>

move container.h to sdk/

QDesignerContainerExtension has absolutely no business in uilib - it's
not about dynamic .ui loading, but a customization of designer itself.

Change-Id: I4fe9acf2c07bc06e0f0d34c541e5d6300a1dc7ce
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Fix misoverloaded virtual due to recent change in qtdeclarative

qtdeclarative/9d7b27f5bf44 changed the method's signature.
Added Q_DECL_OVERRIDE so it doesn't happen again.

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

windeployqt: Additionally check on Qt5WebKit[d].dll for ICU dependency.

Qt 5/Windows is no longer configured with -icu by default, only QtWebKit
still depends in it. Its library needs to be checked for ICU as well.

Task-number: QTBUG-45962
Change-Id: Ib08c2ece446f4f1cc4db2410fc0e554363181a6c
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

winrtrunner: Remove the app when stopping on Windows Phone

The native API fails to stop the app, but removing the app will
successfully stop it. Until we have a reliable way to stop the
application, simply remove the app instead.

Task-number: QTBUG-41946
Change-Id: I98662103a7242f806e2eb5ef06cfd60372df681a
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>

winrtrunner: Remove Xap engine

Windows 8.0 and Windows Phone 8.0 support have been removed from Qt, so
remove references to them in winrtrunner.

Change-Id: Ifcb6f60b6122b94ff453aa23334263d4b828608a
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

androiddeployqt: Use correct package name when uninstalling

When calling androiddeployqt with "--install --no-build", it will try to
uninstall a package with a wrong package name. This patch attempts to
read a valid package name from the AndroidManifest.xml before
uninstalling.

Task-number: QTBUG-45433
Change-Id: If2bc788753a24dd752492464c985de70c67b8f72
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>

invalidate message index when inserting in the middle

subsequent offsets become invalid when a message is inserted in the
middle, so the index must be invalidated (adjusting the offsets on the
fly doesn't seem worth it).
also, there is no point in updating the index if it is already invalid.

Task-number: QTBUG-45831
Change-Id: I9733cb3235c6b8b09dee7eae4d2ecf0a0cdda528
Reviewed-by: hjk <hjk@theqtcompany.com>

update message index when message gains source text

when a message which is first seen with only an id later gains a source
text, this text would not have been indexed. so a subsequent new message
with the same source, but without an id this time around, would not be
seen as a dupe of the first message.

Change-Id: Ib35f820e2b02311ea9c9996383a2789095098d6f
Reviewed-by: hjk <hjk@theqtcompany.com>

windeployqt: Append Qt bin directory to path.

Ensure qt.conf is taken into account when running qmake -query.

Task-number: QTBUG-39177
Change-Id: I0a8260033f49ddb21bf46ccbfe576ddb00db5679
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

Bump version

Change-Id: Ib3ce9b642f65dc89847a61332d00ff9cde04d596

Add location to the supported module list

Qt 5.5 introduces Qt Location and the plugins were not deployed so far.

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

linguist: Fix loading of multiple identical source texts

Show all translations from all .ts files in case
they provide the same source text and comment multiple
times with different IDs.

Previously, Qt Linguist showed the translations only for
the first occurrence, because the merging code in
MultiDataModel::append() compared only source text
and comment, but not the message ID in case it was there.

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

macdeployqt: Support Qt frameworks using rpath

This makes macdeployqt understand dependencies expressed with @rpath
prefix which are resolved using Mach-O LC_RPATH commands.

Follows up c0a54efc4091b365ffac09fc2827cf92f849d698 from qtbase.

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

Qt Designer Examples: Fix code around constructors.

Make constructors explicit, use constructor initialization for member
variables, remove unused variables.

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

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>

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

Change-Id: Ia0594c63ea035a715b163395027178b2ea2752ed

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.5' into dev

Change-Id: I17deb71512f5026bdf329e2235f50df76b9e6d93

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

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

Change-Id: Id1f9650707d821fe98e5f92ec77bc42cb96e32ed

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>

Add an option to suppress status messages in qhelpgenerator.

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

Bump version

Change-Id: Ide874606e7bb380cf885b845592de81611504f5a

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>

qtpaths: add ApplicationsLocation

Change-Id: Iaf7d363e33e9806d46a8a495469c562aa5d2f6e8
Reviewed-by: Sune Vuorela <sune@vuorela.dk>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.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>