Try to load designer_<LANG>.qm first and load qt_<LANG>.qm only
if the former succeeds.

Task-number: QTBUG-41790
Change-Id: Id4862019edf81da81bf9d059c586bbfee18ab7e6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

After the introduction dynamic GL loading, the platform plugin no
longer directly depends on the GL libraries.

Change-Id: Icd3a5836fff52071df33a5ad87dea528c11ee83c
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>

Change-Id: Ia20e63c1427af954c04d0a6c384802fabc2e7bfd
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>

Change-Id: I0bb260c7c8992ae24dda6f84eaf304329eb4159c
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>

This library is not needed anymore for the release with Qt 5.4

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

Construct the argument list using "-rootPath", which
correctly handles multiple qmlDirs. Don't merge
qmlimportscanner stdout and stderr. Log stderr as
macdeployqt warnings.

Change-Id: I6f82f90f4e242c9aa246ab26ba3b9af88e1fd123
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3
- Removed LICENSE.GPL

Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>

QtWebKit follows the web standard use of 96 DPI for font sizes and
this is a good compromise for the web, but this would require each
Assistant user to zoom the text manually without the benefit of
keeping existing content working (since we don't show any external
content in Assistant that could break with a higher DPI).

HiDPI on OS X already handles the issue by scaling the whole page by
two, but since we don't completely support DPI awareness on Windows,
Assistant assets and text will be scaled but the documentation
itself will be microscopic.

Use the zoomFactor to adjust the DPI according to system settings
by dividing QScreen::logicalDotsPerInch() by 96.

Task-number: QTBUG-41076
Change-Id: I5644d0b383fcaf04bed156207afca9b322ea18a6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

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

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>

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>

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>

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>

QtDemo was removed with a commit in qtdoc.

Change-Id: I4ebbc5825dd3e30652903a459f21ea26d5fd4682
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

Conflicts:
	.qmake.conf

Change-Id: I32718899f94175b7012ac5ba208fc18eb54b3ae9

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>

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>

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>

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

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>

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>

Change-Id: Ib882880ca853660bdd3cd6388d4e94b020e87ce3

Change-Id: I5ce2fc73aa2b5b3d1c7e2108105c32cb810cd6bf

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>

Change-Id: Iefecda4cf8b2dbbe07f8c22ffd17286bd0e024e1
Reviewed-by: Andrew Knight <andrew.knight@digia.com>

Introduce convenience function for exclusive options.

Task-number: QTBUG-40663
Change-Id: I03dd88f5bcec55f0190501c1faae0ec66d607016
Reviewed-by: Andrew Knight <andrew.knight@digia.com>

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>

[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>

Make debugging work with both Qt Creator 3.1 and the upcoming 3.2.

Change-Id: I0d13d353fe560aee0c0103959d9619f14786ba57
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Conflicts:
	src/macdeployqt/shared/shared.cpp

Change-Id: I121d34332ec6ad04ee579838bc40be0ea1b9e290

Using gradle it doesn't need ant to be installed anymore.
It's also much way faster than ant (on multiple builds),
on my computer is 25-50% faster than ant.

[ChangeLog][Android][androiddeployqt] Added Gradle support to build the
APK.

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

This option is needed to install the package in a separate step without
rebuilding it.

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

Except for the license header and the new auto return functions, the
qtconcurrentrun.h header is now reproduced faithfully again.

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

The output is still very different from the checked-in file in QtCore.

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

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

Manually adjusted src/androiddeployqt/main.cpp
after 73e4f959
Patch by BogDan Vatra.

Change-Id: Idcf4ae7f54346119ee09001b1b55225a08dd9b21

This library was an experimental feature that has been removed from Qt.

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