Update copyright year in About dialogs

Change-Id: I4c911c809c3779f7ac59917d5d88a38628817f67
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Merge remote-tracking branch 'origin/5.3.2' into 5.3

Change-Id: I75765dd8b4ebe39933da89933df1d61ae209e0cd
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>
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>
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>
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>
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>
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>
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>
Update copyright year in "About" dialogs to 2014.

Change-Id: Ia9807bc783d3f83ab1556faeb3fa73af3be4505d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
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>
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
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>
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>
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
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>
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>
windeployqt: Add missing include.

Change-Id: Id309f777a04b03fc9db099477fe83d4d80bfe495
Reviewed-by: David Schulz <david.schulz@digia.com>
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ib8043f1dce5bcb3999965b91d3d7522fd1289eb0