fix gaelic plural rules

[ChangeLog][Linguist][Important Behavior Changes] The Gaelic plural
rules now know four forms. To keep existing translations intact, set
their language to Irish.

Task-number: QTBUG-40566
Change-Id: Ia3c315bb4d9bda8fac57b39c9b1a5653a1a44260
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Add missing #include for QDataStream

main.cpp:542:22: error: variable ‘QDataStream s’ has initializer but incomplete type
qm.cpp:236:16: error: ambiguous overload for ‘operator<<’ (operand types are ‘QDataStream’ and ‘quint8 {aka unsigned char}’)

Change-Id: Ie54f6b8e0362bb5d501a9ce58fd206d32fb3b697
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
windeployqt: Fix -webkit2 / -no-webkit2 command line options.

Introduce convenience function for exclusive options.

Task-number: QTBUG-40663
Change-Id: I03dd88f5bcec55f0190501c1faae0ec66d607016
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
windeployqt: Fix warning about unused 'version' variable.

Change-Id: Iefecda4cf8b2dbbe07f8c22ffd17286bd0e024e1
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
macdeployqt: don't use hardcoded lib/ when searching for dylib

Currently when parsing otool output for dylibs, "lib/" is appended to
the path. However dylibs might not be always found in a lib folder like
e.g. the mysql client libraries from macports. This patch aims to remove
that hardcoded path and use the data from the currently parsed otool
line.

[ChangeLog][OS X][macdeployt] Fixed a bug where dynamic libraries where
searched in the wrong directory

Task-number: QTBUG-21913
Change-Id: I992d15bc48ad827185216852108b2d0a5633043e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I5ce2fc73aa2b5b3d1c7e2108105c32cb810cd6bf
Bump version

Change-Id: Ib882880ca853660bdd3cd6388d4e94b020e87ce3
windeployqt: Detect Quick applications by checking Qt5Quick[d].dll.

Applications no longer have a direct dependency to Qt5Qml[d].dll.

Task-number: QTBUG-40663
Change-Id: I2b3569c3d39f6a96e3f44d6e2541c6697c93bd7f
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
remove pointless empty column in message list

the view has one column less than the context list, so reflect that in
the model.

Change-Id: I51c87167bc334b47e4a35874a476823db4908790
Reviewed-by: hjk <hjk121@nokiamail.com>
windeployqt: Special case non-standard modules.

Task-number: QTBUG-40670
Change-Id: I3897b4149587cf4e90cbdaf6d54ef8cff70d22d2
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
fix context checkmarks

not such a good idea to not count finished messages towards non-obsolete
ones.

amends 9d3cbd0a.

Task-number: QTBUG-34921
Change-Id: I22d0dd14c094a33973635c23e59c66d72c6c746a
Reviewed-by: hjk <hjk121@nokiamail.com>
Android: Make search for import path case insensitive on Windows

The file system is case insensitive on Windows, and if you e.g.
specified a lower case drive letter in your prefix when building
Qt, then we would bail out because we would think the path
of any given import was located outside the import paths specified.

Task-number: QTBUG-41012
Change-Id: I22a1be32a221cd754dfed93e125d685bade65828
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Assistant: Fix a name of a bookmarks folder

The folder named "Toolbar Menu" is meant to contain bookmarks which
are displayed on the bookmarks toolbar rather than in some menu.
So the name "Bookmarks Toolbar" is more appropriate, besides it is
consistent with Firefox and is similar to Chromium's "Bookmarks bar".

Change-Id: I1b1c359ee4ca02dcd34afff01326442c5d9b4459
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
	.qmake.conf

Change-Id: I32718899f94175b7012ac5ba208fc18eb54b3ae9
Remove qtdemo from gitignore

QtDemo was removed with a commit in qtdoc.

Change-Id: I4ebbc5825dd3e30652903a459f21ea26d5fd4682
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Qt Designer QDesignerContainerExtension example: Fix page title.

Tie the setting of the combo title to QQWidget::windowTitleChanged().

The call to retranslateUi() happens after adding the pages; so
the titles are lost in uic-generated code.

Change-Id: Ia88dd694a7ab5fe1bd62a849feeb7768a2ba6f16
Task-number: QTBUG-24916
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Don't remove assets folder.

The user might copy files in assets folder at install time.

Change-Id: Ib26f6d0546aae70788c09bf455835647e3deb602
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Make sure the outputDirectory contains the full path not relative.

Trying to run a process using the relative path on windows fails.

Task-number: QTBUG-41431
Change-Id: I0c9aa837dc7a556372b1018feb2f7f5c14c2652a
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
qdbusviewer: Extract MainWindow class

This refactoring is a preparation for saving/restoring window settings.

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