Bump version

Change-Id: Ie1e2dd433215df1037accc0cef807b009272a40c

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>

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

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>

Q_ASSERT now always expands the argument

We need isDescendant to be defined.

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

windeployqt: Add option to skip qmltooling

These plugins should be left out when creating release packages, so add
the option to disable them.

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

windeployqt: Accept a list of positional arguments.

The first argument can be either a binary or a directory containing
the binary. Further arguments can be either libraries or directories
containing libraries (plugins).

Task-number: QTBUG-41670
Change-Id: I48dd157f6404118400948ef019016c2aa6661762
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

windeployqt: Add --release-with-debug-info option..

The option can be used for Qt builds with
-force-debug-info -release .
For those, deployment fails with "Unable to find the platform
plugin." since the DLLs are detected as debug-built. If windeployqt is
extended to actually read Qt configuration information, the value can be
obtained from there.

Task-number: QTBUG-42072
Change-Id: If8b4a0e41821b5f0f4b7023b1b9a3d49e50628a1
Reviewed-by: Jarred Nicholls <jarred.nicholls@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

androiddeployqt: Fix dependency order for XML dependencies

Although this bug was there in Qt 5.3 as well, something has changed
in our build system that causes readelf to return libraries in a
different order than before. In particular, the QtMultimedia dependency
is now listed before QtQuick if it's listed first in the QT variable in
the .pro file. This caused the following bug:

When we read the manual dependencies from the XML specification,
then we assume the dependencies of these are already met (otherwise
they should not be added). Therefore, we need to load these
dependencies last, not intermingled with the actual direct
dependencies of the application.

What would happen is that Qt5Multimedia came before Qt5Quick, and
triggered adding Qt5MultimediaQuick_p before Qt5Quick. This of course
depends on Qt5Quick so it needs to be added after it (which is why
it is only added if the application itself depends on Qt Quick).

Change-Id: Ifa97d85645cff49ebf65d4ce3fc2101506346695
Task-number: QTBUG-42012
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

windeployqt: Make check for Qt modules more discriminative.

Qt Creator's QtcSsh.dll is not a Qt module.

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

Remove the Qt Designer arthurplugin example.

The example accesses code from the qtbase, which does not work.

Task-number: QTBUG-28147
Change-Id: I842080eee5b0ea5ed1da6a4e08ae3d6e9f9ead5f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

windeployqt: Add missing include.

Change-Id: Id309f777a04b03fc9db099477fe83d4d80bfe495
Reviewed-by: David Schulz <david.schulz@digia.com>

Assistant: prevent the main window from jumping during startup

Remove the 6 year old hack which causes an early show of the main window.

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

Assistant: Make "Bookmarks Menu" the default bookmarks folder

Assistant doesn't show the bookmarks toolbar by default so it's more
reasonable to preselect the "Bookmarks Menu" folder when a user adds
a bookmark.

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

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

uic: don't use QStringLiteral in comparisons

For QLatin1String, operator== is overloaded, even for QStringRef,
so comparing to a latin-1 (C) string literal is efficient,
since strlen() is comparatively fast.

OTOH, QStringLiteral, when not using RVO, litters the code with
QString dtor calls, which are not inline. Worse, absent lambdas,
it even allocates memory.

So, just compare using QLatin1String instead.

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

generate_ui: adapt to upstream change in qtbase

Change 106487387d493dab934e19b33bfed55b8df62d67 in qtbase
removed a few ? true : false, some of them happened to be
in uic's generated code.

Adapt the generator.

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

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

Conflicts:
src/assistant/assistant/mainwindow.cpp
src/linguist/linguist/mainwindow.cpp
src/qdbus/qdbusviewer/qdbusviewer.cpp

Change-Id: I1f5524ab747be561ed0b13d8b1fd8cb51a890363

Assistant: Fix index updating on startup in the remote control mode

HelpEngineWrapper::initialDocSetupDone() should be called only once
right after the initialization of the help models. Calling it on
every small update leads to recursion.

Task-number: QTBUG-36850
Change-Id: I16cae03f08bbc9a19ec9298c84c602a4046dce93
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

Update copyright year in "About" dialogs to 2014.

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

uic4: update sources from current generate_ui

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

Android: Support recursive ANDROID_DEPLOYMENT_DEPENDENCIES

The convenience of ANDROID_DEPLOYMENT_DEPENDENCIES would be
greatly increased if you could include a directory and have its
contents be added recursively to the deployment, instead of
listing each file individually.

Change-Id: I3cf3248007369122ea6ba98ab79f7f2f951a26c3
Task-number: QTBUG-41674
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

macdeployqt: fix checking for existing deployed files.

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

windeployqt: Add support for QtWebEngine.

Change-Id: I92d8d5271c0dc53cc37ea6f699e75ab91ad0cf3a
Reviewed-by: Michael Bruning <michael.bruning@digia.com>

Qt Designer: Load translations only when designer_<LANG>.qm is present.

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>

Make sure the content widget never replaces valid data with empty data.

This could happen because insertContents() is called once for
every run of the content provider, even if an invalidation happens
in between. Example sequence:
    run()
    invalidate() [removes result of first run]
    run()
    insertContents() [queued for first run, retrieves result of second run]
    insertContents() [queued for second run, retrieves empty data]
We now check in insertContents() whether the content provider has a
valid root item and do nothing if it does not. This means that
insertContents() will never replace the current model data with empty
data; only invalidateContents() can do that from now on.
Further improvements:
    - Only call insertContents() if the run was not aborted; this
      reduces the number of useless objects in the event queue.
    - Remove the m_rootItem member; it was only used in the run() function.
    - Only add the root item to the list at the end of a successful run;
      there is no reason this object should be accessible from the outside
      while there are still children being added to it.

Change-Id: I80e2ea93dd9bbc8ab7f406c989b61f16f11b6eea
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

windeployqt: Use Qt5Gui.dll to detect ANGLE/OpenGL.

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>

Prevent re-deploying already deployed imports.

Check if the target directory exists before copying
the import.

Change-Id: Id729f26b4b887c7a3b209aa88649eca3fc73b0ba
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

Work around legacy framework structures.

Existing versions of qmake produce application bundles
which are incompatible with OS X code signing.

Deploy framework Info.plist files to the correct
location. Patch them to remove any "_debug" suffix
on the value for CFBundleExecutable.

Task-number: QTBUG-32896
Change-Id: Id657e394f3bf919713a43e395e716bf46488c644
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

Make deployed Qt Quick imports code signable

The OS X code signing process enforces strict code/data
separation. Split up the Qt Quick imports; deploy
.dylibs to "Contents/Plugins/quick/", deploy .qml files
and other resources to "Resources/". Create symlinks
to the dylibs so that Qt Quick can load the imports
as usual.

Task-number: QTBUG-34810
Change-Id: If7e1f80b357598c8e3cc7dd46a9363387218d541
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

Add -codesign option.

Use the "codesign" tool with the provided signing identity to
sign all code binaries in the bundle. Application code binaries
include the app executable(s), plugin and framework/dylib
dependencies.

Finally, run "codesign --verify" to verify that the app
bundle is correctly signed.

Change-Id: Idfff030a2b218e1dc1ad1bc279a32a330665b347
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

Fix framework bundle deployment

Rework copyFramework(). Split out dylib deployment
into copyDylib(). Remove the special symlink handling.
Always create symlinks from "Current" to the actual
version.

This ensures we're compatible with Apple's framework
bundle spec [1]. It also makes the 'codesign' utility
happy, easing the step to sandbox Qt OS X applications.

[1]: https://developer.apple.com/library/mac/documentation/
macosx/conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html

Task-number: QTBUG-32896
Change-Id: Ide23437c9bb6515d5013d37ae6ff4133a69085ad
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

Qt Designer: Add QOpenGLWidget.

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

windeployqt: Deploy software rasterizer for dynamic Open GL builds.

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

Removed run-time library for the QML compiler

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

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

Improve how macdeployqt calls qmlimportscanner

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>

Update license headers and add new license files

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

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

Zoom the documentation according to the system DPI by default

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>

Qt Designer: Fix range check of double properties.

Change-Id: I18348c0e354a8dd9306d40557700e34225c21014
Reviewed-by: Jarek Kobus <jaroslaw.kobus@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>

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>

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>

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>

Fix crash when accessing the content model.

1) Make sure invalidateContents() is called whenever the help engine's
   DB readers are destroyed.
2) In QHelpContentProvider::stopCollecting(), remove all root items, as
   they are invalid now: Their child items reference DB readers that
   are going to be destroyed.

Task-number: QTBUG-18829
Change-Id: Id9cc4ea99c43c36ad5c5d1f04157a68bac79d44a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

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

Merge remote-tracking branch 'origin/5.3.2' into 5.3

Change-Id: I75765dd8b4ebe39933da89933df1d61ae209e0cd

Remove qtdemo from gitignore

QtDemo was removed with a commit in qtdoc.

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

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

Conflicts:
.qmake.conf

Change-Id: I32718899f94175b7012ac5ba208fc18eb54b3ae9

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>

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>

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>

Update copyright year in About dialogs

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

windeployqt: Special case non-standard modules.

Task-number: QTBUG-40670
Change-Id: I3897b4149587cf4e90cbdaf6d54ef8cff70d22d2
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: 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>

Bump version

Change-Id: Ib882880ca853660bdd3cd6388d4e94b020e87ce3

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

Change-Id: I5ce2fc73aa2b5b3d1c7e2108105c32cb810cd6bf

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>

windeployqt: Fix warning about unused 'version' variable.

Change-Id: Iefecda4cf8b2dbbe07f8c22ffd17286bd0e024e1
Reviewed-by: Andrew Knight <andrew.knight@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>

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>

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>

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

Android debugging compatibility fix for Creator 3.1

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

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

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

Conflicts:
src/macdeployqt/shared/shared.cpp

Change-Id: I121d34332ec6ad04ee579838bc40be0ea1b9e290

Android: Say hello to gradle support!

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>

Add --no-build option.

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>

qtconcurrent/generaterun: adapt to earlier changes in qtconcurrentrun.h

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>

qtconcurrent/generaterun: adapt to run(QThreadPool *pool,...)

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

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

Update qtdiag to match the new function names in QSysInfo

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

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

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

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

Change-Id: Idcf4ae7f54346119ee09001b1b55225a08dd9b21

Remove d3dcompiler_qt from deployed libraries

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

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

Remove qtd3dservice

This was an experimental feature which is no longer required or maintained.

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

Add bearer plugin deployment

This patch implement the bearer plugins deployement

[ChangeLog][OS X][macdeployqt] Now correctly deploys the network related
plugins

Change-Id: I37e8a7033bc4d7d41fe34314ddac7b441696c5b7
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

androiddeployqt: qmlimportscanner support

Enables qmlimportscanner support in the deployment tool. Will
use the root path set by qmake to determine dependencies, which
by default will be the location of the project's .pro file.

Other effects: This removes the requirement to add QT += foobar
to enable using imports from the module QtFooBar, and it also
enables adding custom QML imports.

[ChangeLog][Android][androiddeployqt] Added support for using
qmlimportscanner to detect QML import dependencies of application.

Task-number: QTBUG-34175
Change-Id: I5af5964f9e453121eeff8b442f0c5e72676b1fbe
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Display the selectors from QFileSelectors in qtdiag too

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

qtdiag: Display the detected OpenSSL version number in hex

It's a lot easier to read 0x1000108f than 268439695.

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

qtconcurrent/generaterun: allow to pass the output dir as an argument

The hard-coded paths don't exist anymore.

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

qtconcurrent/generaterun: compile

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

Android: fix zipAlign location.

Stating with android tools v23, the zipAlign tool was moved from
<android_sdk>/tools to <android_sdk>/build-tools/<build_tools_version>.

Task-number:QTBUG-40481
Change-Id: Id9207b6e382b0e79522d9fc529453ccd39aebe0d
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Display the detected architecture in qtdiag's output

The build architecture is part of QLibraryInfo::build()

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

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

Fix compilation of qtdiag.

Adapt to changes in QSysInfo API.

Change-Id: Iae95ed9f10f260f9c89cb27b6f50a13322fa8068
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>

androiddeployqt: Force Qt Gui dependency for all apps

Currently, the only way to launch an Android application is through
the platform plugin, which of course depends on Qt Gui. This causes
problems running corelib autotests, since they have QT = core in
the .pro file and thus will not deploy or load the platform plugin.

At some point, we may have a way to launch pure corelib-applications
on Android (like services), but until then, we need to hardcore the
dependency on Qt Gui to make sure these autotests run properly.

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

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

Change-Id: I8c3a43456ee3e378adbbda0d528d06201fd87256

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

Change-Id: Ia75281ed8c11fcd49a5cad55a4caa3c75fa670e9

androiddeployqt: Refactor findFilesRecursively()

Currently, androiddeployqt expects all the detected dependencies
to reside inside the Qt installation directory. Once we add support
for the qmlimportscanner, however, they can reside in any of
the qml import paths. The refactoring prepares the code for this,
separating the relative path (the path of the file when it is
installed on the device) and the absolute path (the source file).

Task-number: QTBUG-34175
Change-Id: I5173034a02e29f88f8ca6f2b61c0caea6ba71778
Reviewed-by: BogDan Vatra <bogdan@kde.org>

windeployqt: Clear read-only attribute when copying files.

The deletion of the empty QML directories fails when not doing so.

Task-number: QTBUG-40152
Change-Id: I0ff78440646239897b4867c3b3cfe1af8b2769f9
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>