Merge branch 'stable' into release

Change-Id: Idb96b903fb08ad6fcd8fad4ba139bab27c8554da

Fix warnings found by the headersclean test

qhelpsearchengine.h:71:9: error: declaration of 'wordList' shadows a member of 'this' [-Werror=shadow]

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

Move functions from an anonymous namespace in a header

Clang doesn't like functions declared in an anonymous namespace in a
header and then later not used. It treats those are static functions,
and the -Wunused-functions warning is printed for them.

Instead, declare them inline in a regular namespace and use it.

qclucene_global_p.h:106:19: error: unused function 'QStringToTChar' [-Werror,-Wunused-function]
    inline TCHAR* QStringToTChar(const QString &str)
                  ^

Change-Id: I94696d40693558ef105281c8ec6e30159c47844d
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

make use of qtHaveModule()

Change-Id: I494ad22447fe54be405698f2dfd79e4941019bdc
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Try harder in matching the method signature

In cases where the Propertiesdialog has no specific Implementation
for a dbus data type, it creates a regular QLineEdit. In such cases,
qdbusviewer then tried to call the method with the arg set to a string
instead of the real datatype (for example uint64), which usually does not work.

We can be more clever and try to implicitely convert the user input
to the right datatype, which makes the invocation succeed.

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

Add changes-5.0.1 file

Task-number: QTBUG-26065
Change-Id: Id7b0b90c571d3f4419ea3f792cb49832fab6738e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Bump Qt version to 5.0.1

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

Fix warning about hidden overloaded virtual, found by Clang

qlayout_widget.cpp:1577:17: error: 'qdesigner_internal::<anonymous namespace>::QBoxLayoutSupport::findItemAt' hides overloaded virtual function [-Werror,-Woverloaded-virtual]
    virtual int findItemAt(int /*at_row*/, int /*at_column*/) const {    return -1; }
                ^
/Users/tjmaciei/src/qt/qt5/qttools/src/designer/src/lib/shared/qlayout_widget_p.h:198:17: note: hidden overloaded virtual function 'qdesigner_internal::QLayoutSupport::findItemAt' declared here
    virtual int findItemAt(const QPoint &pos) const;
                ^

Solve the problem by using the old functions, hence not hiding them.

Change-Id: I3af0c43fc7266ae74e8b05103e4306be740c618a
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

fix install path

Change-Id: I6a56cff510011e3ffd516d24d9659f75baca14b2
Reviewed-by: hjk <qthjk@ovi.com>

Add qmake generated files to .gitignore.

Add source files generated by qmake for automatic static plugin
imports to .gitignore.

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

Merge 'release' into stable

Change-Id: Ie325bf13e34736edf4118c8ee640e23b2f9270bf

remove some unnecessary (and even wrong) project setup code

the centralized code handles it just fine

Task-number: QTBUG-28633
Change-Id: I46105ab301869dec807fdc4ca5fe5e563bc217b9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Fix help URLs in tools.

Task-number: QTBUG-28689

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

point dependencies to 'release' branches

Change-Id: I335664312eea8c0911b1edcc37c1c4e96212722f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Doc: Correcting qhp links to the Linguist and Assistant examples

Task-number: QTBUG-28579
Change-Id: I9b46915e2f5fcd1b228e7b302bcb433f820460a2
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>

Doc: Fixed qhp link to Qt UI Tools C++ Classes

Task-number: QTBUG-27777
Change-Id: I08eab3e32e37a96066f3b922712babd327c4e95c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Enable exceptions code, makes Assistant far more stable.

Task-number: QTBUG-28592

The reason to enable exceptions (always) is that we build the
full text engine with exceptions as well, which throws erratic.
Once it does that the database it creates is in a unknow state,
which leads to new exceptions on next Assistant start. So it will
never start again until someone removes the broken index by hand.

Change-Id: Ic24a9e28bddf4657753f9b670c38ecda527d7af4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

remove pointless harfbuzz include

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

remove QT+=widgets from SUBDIRS projects

it makes no sense whatsoever

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

remove obsolete DEPENDPATH assignments

qmake now adds CONFIG+=depend_includepath by default, making manual
DEPENDPATH setup unnecessary.

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

remove some unnecessary CONFIG additions

qt is already added by spec_pre.prf, warn_on and depend_includepath by
default_pre.prf.

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

ActiveQt documentation is not registered in Qt Assistant.

Task-number: QTBUG-28609

Note: there's already an task to add files based on its extension, see
QTBUG-28345. Cause this might introduce more regression we decided to
go the whitelist route for the 5.0.0 release and fix it the next minor.

Change-Id: Ia1f72e0ed39746fca203813bfe8523fd9956fb61
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

Fix position of rendered QAxWidget in designer preview

Added correct offset to render call.

Task-number: QTBUG-28595
Change-Id: Iab9fecdcf48c8f72fe28ac1cae72bcd2ea5830e9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Added hardcoded url to Designer Manual

Workaround to QTBUG-28500

Change-Id: I523d7296ac6a1b8ead5ceeed6af2937e7034abdf
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Link only minimal qpa plugin to qhelpgenerator in static build

Task-number: QTBUG-28131

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

Doc: fix the Qt Linguist example page

Use the \group and \ingroup commands to have qdoc
list the examples. Edit the \brief contents.

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

QtTools: Doc: Added missing image to uitools examples.

Change-Id: I6e0144ef2ded5e7dd95b332436a9a7dcbbcfc6fb
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

Doc: Fix example pages for Qt Tools

Use the \group and \ingroup commands to produce Qt 5 style
example pages. Unify the file structure for example docs.
Add example page for Qt Help and move Context Sensitive Help
example to it (from the Qt Assistant Examples page).

Change-Id: I687b18a134037588a5a536fe2353c18dfd44b1d7
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>

make qtbase source requirement explicit

getting rid of QT.<module>.sources references, as they don't go well
with real modularization.

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

make use of qt_headersclean.prf

Change-Id: I20a8c472114c9343562fff3ddefae5113cdaeb52
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

Entered hardcoded url for Plural Form in Translation

Task-number: QTBUG-27512

Corrected in linguist-manual.qdoc

Change-Id: I42a1e618dfd4c09f8f8956fe8df574ef09637d36
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

QtTools: Fixed install targets for examples.

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

QtTools: Doc: Removed example dir from the qdocconf

... because the examples were double build.

Change-Id: I4b6f6ba937f52223dd30eb78fc814646200bbec3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Doc: add missing files for Qt UI Tools docs

The files were ignored by Git, so they did not get
submitted as part of I156dbf0a071137e1e6f3ba99cc390aa88c80b836.

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

QtTools: Doc: Fixing links in designer and assistant.

Change-Id: I98ff1c2dd615cbe3a79f19bada8964082ce8f21f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Doc: Fixing typo in landing page file name.

Change-Id: I24ad7c50437d4cbbdcd95d9df5a63693d213aaa5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Remove scripting getter/setter of QUiLoader.

Scripting in QUiLoader was an experimental feature in Qt 4.8 whose
implementation was removed in
159c3d35d41a121f9cbf55631aebbd309b683811 .

Change-Id: I325ca032033659a03df4ab83f642b6a9b15f5590
Reviewed-by: hjk <qthjk@ovi.com>

QtTools: Doc: Added picture for uitools.

Change-Id: I922772f91a5d6c131d7896a1026ddb023649bd48
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Doc: modularize Qt Designer custom plugin docs

Create index and module pages for Qt Designer custom
plugin classes. Modify the qdocconf file to also build
the Qt Designer plugin class docs. Move snippets from
qtdoc to qttools. Fix links to the classes page in example docs.

Change-Id: Ie191fdb07fb0b00379a15d44c1355f00815053e6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>

Doc: Modularize Qt UI Tools documentation

Move the Qt UI Tools examples and example docs to qttools.
Create index, module, and example pages and a qdocconf file.
Fix links to module documentation (index page). Fix links to
snippets and examples. Add the command to build docs to the
project file.

Change-Id: I156dbf0a071137e1e6f3ba99cc390aa88c80b836
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Add PLUGIN_CLASS_NAME to qttools plugins

Needed for automating static plugin loading.

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

Doc: Modularize Qt Help docs

Add index and module pages for Qt Help, add a qdocconf file,
and move snippets. Add doc build command to help.pro.

Task-number: QTBUG-28449

Change-Id: Ic022693d82ee3664bf57e708df89c4a71aadb78e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

QtTools: Add example page for assistant.

Change-Id: I1f15f3db46206731da7741554cc128620af7f652
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

follow move of cmake file templates

Change-Id: I712dc95c62597064acf60ecc594638c3a69ff8e8
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Doc: Replace outdated macro from docs

Change-Id: I525c1322a46115f64fe94d48a0ebc2d4fb2e2e12
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

doc: Remove old information about Qt Linguist 4.3 and Windows Vista

Remove old text about Qt Linguistic being certified for Windows
Vista. Also removed the Windows Vista image.

Change-Id: Ie8fde974e0666f48dd86f691c3c2745a252549bf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>

Remove dependency to ActiveQt sources in designer plugin.

Seems that building using qaxtypes.* directly from qtactiveqt repo
is unnecessary, so remove them.

Task-number: QTBUG-26848
Change-Id: I4a5e071b83697fd6ee83a742cba6ae13c8b343fb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

QtTools: Fix example names after adjusting exampledirs

Change-Id: I00f60412346c85de044eb784a36f98a12c4ccd05
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

QtTools: Doc: Moved assistant examples

... and changed exampledirs in the qdocconf files
to the appropriate modules.

Change-Id: Ic15d9fc845d59fb4e84ee39a52e457666fa09e51
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Make kmap2qmap compile again

Task-number: QTBUG-28165

Change-Id: I46dc5c05f6f4d6079ec53a94abda0351cdfb5f83
Reviewed-by: Karim Pinter <karim.pinter@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Doc: move a Qt Designer howto to qttools

One more file was missing from the modularization:
Creating and Using Components for Qt Designer. The links to
images in the file were consequently broken.

Change-Id: I7ae9f7efd74acc3dc030999796afcbaa48110696
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

QtTools: Doc: Fix lots of links in the designer manual.

Change-Id: I7ae1e9b56f6066798ca8620d96bf42f991b1064d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Change project names in tools' qdocconf file

This triggers generation of suitable qthelp:// urls in the example manifests

Change-Id: Ibecd48fa7854e9916cc7b0a2e33569935d387c69
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>

QtTools: Remove reference to lupdate and lrelease

... in the linguist manual.

Change-Id: I26f4289760f3b70c1f7815872b86e33fe94718f3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

fix installation target paths of examples

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

leverage qt_example_installs.prf

Change-Id: Ie6b02fd48aaa6b303629bb8e66cfe567aa8ca7df
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Add \brief description to tools examples.

Change-Id: I713620c8c5cf55147b1c5732d745569916a8e264
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Change copyrights from Nokia to Digia

Change-Id: I118a50ef99e42878c01e1ee509c2bf86c70ec05d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Qt Linguist: Fix help URL.

Task-number: QTBUG-28373

Change-Id: I1c5929ffee32843867d2401a23386545f36b9bcc
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Qt Designer: Fix help URLs.

- Fix building of URLs.
- Correct URLs of manual and style sheet manuals
- Remove the 'What's new' option.

Task-number: QTBUG-28373
Change-Id: I4d1dfd6154f799e9bb00c0a75aa62a7239b0f81f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>

Doc: add example pages for Qt Designer and Qt Linguist

Move the example landing pages from example.qdoc in qtdoc
to the appropriate places in qtdoc.

Change-Id: Ieb5a2b001b1e20940903f3e53856bcbf8138ed76
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

QtTools: Fix some links to Qt Linguist Manual.

Change-Id: I749a522894ae30219d1579d1d78456c944912204
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

sync.profile: Point dependencies to 'refs/heads/stable'

We should test stable branches against stable branches only.
At some point we should automate the merges from dev->stable->release
and decide how to handle possible merge conflicts.

This is good enough for the time being.

Change-Id: I25e8206d8df8f69ffc5c282487e5d8af22e6b690
Reviewed-by: Janne Anttila <janne.anttila@digia.com>

remove symbian vestiges

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

Add all new doc files we have for Qt5.

Change-Id: I8079a612ff18eba07134224cb982fc512ce5c429
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

Fix build of the Designer QAxWidget plugin.

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

Doc: fix issues in the Qt Linguist docs

Fix the issues listed here:
http://community.kde.org/Qt5/Documentation/OverviewClassification

Do some editing. More editing will be done later, and the QML info
will be integrated to the manual.

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

We check pointer after use it. Found with cppcheck.

Change-Id: I06b6006e122c3bba7144251e85c8c3616e5369da
Reviewed-by: David Faure <david.faure@kdab.com>

QtTools: Remove reference to deprecated Q_EXPORT_PLUGIN2

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

remove obsolete .desktop files

Change-Id: I2a4974229c18b5ad4d18089fc076d86457557cc1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Doc: move Qt Linguist example docs from qtbase to qttools

Move qdoc files, images, and snippets.

Change-Id: I6ab84892dc56c23bfd056faa0713a572c814a1c2
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Change copyright information from Nokia to Digia

In addition, some QUrl changes were required as I had to
re-genegerate test.qch

Change-Id: I03f6b3ab4a0743244fc93af92b024a084d4b7a15
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Doc: move Qt Designer example docs, images, and snippets to qttools

Change-Id: Ib02369b0a3970432685e5eb5e271902f399fab7e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Rename linguist.qdocconf to qtlinguist.qdocconf

Follow suit with the other tools.

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

Rename designer.qdocconf in qtdesigner.qdocconf

This is consistent with assistant.

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

QHelpGenerator: Allow launch without window manager

Use the minimal plugin by default.

Change-Id: I2aa08c0ffcc76ce8692b481efb25497649b9b1d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>

Doc: Fix issues in Qt Designer docs

Fix the issues listed here:
http://community.kde.org/Qt5/Documentation/OverviewClassification

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

Doc: Renaming Qt Assistant Manual's HTML page name.

-qtassistant-index.html conforms to the Qt 5 standard.

Change-Id: Ib8760790a389776bd9f37e5eab63adda1f3eb000
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Doc: Modularize Qt Linguist docs

Move docs from qtdoc to qttools. Move examples and example docs
from qtbase to qttools. Fix references to snippets and examples.

Change-Id: Ib9f89bac416473dcfd8b4d06a05f8d07ff7c2fd0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

centralize and fixup example sources install targets

follow respective change in qtbase

Change-Id: I6e892deb9fa3868579e9c556fbcf00cc7bc6145c
Reviewed-by: hjk <qthjk@ovi.com>

macdeployqt: Fix deployment of sql driver plugins

Task-number: QTBUG-28248

Change-Id: I5e31770a3d31cb22b1ab17574ea38e509c59470d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Assistant: rename doc/assistant.qdocconf to doc/qtassistant.qdocconf

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

Update information from Nokia to Digia and Qt Project

Task-number: QTBUG-28156
Change-Id: I2d813a0f4fa266af004714f04b16501f5751c881
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Assistant: adjust to recently changed location of .qch files

Change-Id: If0a395d332fbbba5cd5875e325db87d2087b09e5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

Doc: Modularize Qt Designer Manual

Move the appropriate files from qtdoc to qttools and fix the links.
Create a qdocconf file and modify designer.pro.
Actual content fixes will be done in a separate commit.

Task-number: QTBUG-28025
Change-Id: Ibde5c0fe0b1ddbeb845d10a2a5ebf609491235b0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Doc: Changed qch namespace from "com" to "org"

"org.qt-project" is what the Qt 5 modules use.

Change-Id: I86dc881672db7e9a56ba10c0a76c6485fe6e7c73
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Fix static build of Qt Designer on Windows.

Ensure QT_DESIGNER_STATIC is defined everywhere such that
the EXPORT macros evaluate to empty.

Task-number: QTBUG-28131

Change-Id: I111b1351c4d81172adc9110d31b8b7ed13af7ef5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Fix inbuild help and message. Remove Trolltech references.

Change-Id: Ibe74e744d737c68854ca98dfe72af43287ff89c7
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Fix build after QLocale enums update

Uncomment "Missing" languages that were added recently.
Use modern language names instead of compat ones.

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

Do not compress QLayout-margin properties when writing UI files.

QLayout::margin is deprecated.

[Do not cherry-pick to 4.8.]

Task-number: QTBUG-27552
Change-Id: I8d25e31d3be0ad336557cc306c3c68e681f9033d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Detect QMainWindow-separator as passive interactor in Qt Designer.

Ensure that dock widgets in Qt Creator can be resized.

Task-number: QTCREATORBUG-8284
Change-Id: If6aa55b2dde8fce53e1527db678f518b3912907b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Backport helpviewer_qwv.cpp fixes from QtCreator bugs 7199 and 8211.

Corrected setup for HelpNetworkReply and changed uses of TextSizeMulti-
plier to use ZoomFactor.

Task-number: QTBUG-27899
modified:   src/assistant/assistant/helpviewer_qwv.cpp

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

Doc: Update Qt Assistant Manual to Qt 5

Make the manual more task-oriented and
update all screenshots. Check functionality
and menu item names.

Task-number: QTBUG-28024
Change-Id: I79ba3740d072fb3a6a30533a578c0a6bfbb9a26c
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

Fix build of the arthurplugin example.

Task-number: QTBUG-28147
Change-Id: I296e3d4d50dffe78e0d70c2486ad6b7641149556
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

QtAssistant: remove references to QApplication::Type

Qt3 legacy QCoreApplication::Type and QApplication::type() will be
removed -> use qobject_cast instead.

Change-Id: I4a4af17ab6c8955af33779d1e5556610c443c93e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

Fix linguist build after updating QLocale up to CLDR 22.1.

Change-Id: Ie03060fe59db43fef83f055b7000240368fe9d46
qtbase: 3791d21f72a4c7035cd1db42c36dbd1dc7efd0f6
Reviewed-by: hjk <qthjk@ovi.com>

Fix build of installed examples.

Task-number: QTBUG-27977

Change-Id: Ic64563d120087c57c3579c1268d73531d7022111
Reviewed-by: hjk <qthjk@ovi.com>

Doc: Renamed documentation output to "qtassistant" directory.

-project name is qtassistant
-name should match index file for cross linking.

Change-Id: I2f098e3592453185c193a8fbbe97b01dbed50731
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

add support for TR_EXCLUDE

this is necessary for excluding 3rd party code, etc.

Change-Id: I2d32b6014741178bb8a62d29185241c90488754d
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

don't add DEPENDSPATH to VPATH

follow suit with qmake ...

Change-Id: Ie1748d2056c7218b76d75cddd0bc7fb3f66cf8f7
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>