Doc: add link to Internationalization with Qt

To the Qt Linguist Manual.

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

Fix plugin export macros in Qt Designer documentation.

Use Q_PLUGIN_METADATA instead of Q_EXPORT_PLUGIN2 .

Task-number: QTBUG-30508
Change-Id: Iedc1e140d3f597e29911a38e5d5548e6ac9981b3
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Doc: move release management task list in Qt Linguist Manual

Move the description of the release process from the Developer
chapter to the Release Manager chapter.

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

QUiLoader/Designer: Fix gcc 4.8 warnings about unused typedefs.

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

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

Conflicts:
src/assistant/assistant/assistant.pro

Change-Id: I7ca59c8150a591c7e2ba57fd729421b4dba064d0

Assistant: Fix static linking on Windows.

Check for existence of sqlite-plugin.

Breakage introduced by d73afeeafc7df8192508c1a5617944d303d5a0a2 .

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

Generate the Qt5LinguistConfig.cmake files independent of QtUiTools.

The generation relied on the uitools module for the version, so
if it was not available, we got errors like this:

 WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake'
 WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake'
 WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake'

 http://testresults.qt-project.org/ci/QtTools_stable_Integration/build_00128/linux-g++_no-widgets_Ubuntu_12.04_x64/log.txt.gz

Use MODULE_VERSION for the version instead and MODULE_BASE_OUTDIR for the
generation location.

Change-Id: I9daa6878553015e841b6e41fd1f64eb60ada7774
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

Assistant: Fix static linking for Linux.

main.cpp:78: undefined reference to `qt_static_plugin_qsqlite()'

The import for the DB plugin should now be generated by qmake.

Change-Id: I9da25aea8667ca34221427236b8e1d36be77da8b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
(cherry picked from commit f212e46fe930ee89a8cb52beeeccc03369c015a1)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Bump MODULE_VERSION to 5.1.0

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

Doc: edit Qt Linguist Manual for style

Replaced "e.g." with "for example" and "etc" with
"and so on". Removed contractions. Removed some extra spaces.

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

Doc: move Qt Linguist overview information

From front page to a separate topic.

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

Add changes-5.0.2 file

Change-Id: I7c55f4441aa671fc320113a95b74e4b1bdbd689a
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: I359d5bfaa62a4d37a2deec79f80963ae5c19d918

Assistant: Fix static linking for Linux.

main.cpp:78: undefined reference to `qt_static_plugin_qsqlite()'

The import for the DB plugin should now be generated by qmake.

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

make lupdate a host tool

lupdate makes no sense on x-built targets at all.
though one may also argue whether it makes sense to actually bootstrap
it - while its use may be supported by the build system, it's typically
not part of regular builds, but rather used shortly before running
linguist - for which a host build of qt is necessary anyway.
one argument for bootstrapping is that it uses the qmldevtools library,
which logically should be bootstrapped (the only other current user is
qmlmin, which definitely *is* used in regular builds and thus needs
bootstrapping).

Change-Id: Ia3ddd901fe2b0c2b7b77af7f1ebc66d757fc7783
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

make lconvert a host tool

it's a build tool, so it should be built for the host.

Change-Id: I55baee65d3e91bf5189c10f30e23975abfc4de10
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

make lrelease only optionally bootstrapped

qt_tool.prf handles the magic for us.

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

fix translation contexts

the bootstrapped library now fakes the translation api sufficiently
well to enable unifying the usage.

Change-Id: I6a5d7cb1bb67830f1ea0a732566ebee354d62e7e
Reviewed-by: hjk <hjk121@nokiamail.com>

support only utf-8 and utf-16 for source code

utf-16 is optionally used by java and msvc. it doesn't hurt to support
it. all other encodings are not used anyway (other than 8-bit
pass-through, but this is a matter for (the also removed) CodecForTr).

Change-Id: Ie6482e187a9a8276918b53e97faeac88a40eb52c
Reviewed-by: hjk <hjk121@nokiamail.com>

Run the qttools cmake module tests only if QtWidgets is available.

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

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

Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879

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

Remove qaccessible2 bic data.

Change-Id: I629046a2a7aa0611cda4f04f8d6253d5db4e05a3
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>

Install the Qt5LinguistToolsConfigVersion.cmake file.

Change-Id: I8f14f79c1e8e17816d63303f130773780547346a
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

purge CODECFORTR & -codecfortr support

qt-based code is expected to be utf8-encoded nowadays. the respective
c++ interfaces have been purged in 5.0 already.

Change-Id: I592b49f198aae05212afbf8d3aa2b01b1e9369dd
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

purge ui3 support from lupdate

there is no qt3support in qt 5 any more.

Change-Id: I9da9c209095a753d45419fb34a5737cd8dde4dc4
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

purge TS 1.1 support

at the time of release it will be almost five years since we introduced
TS 2.0 and stopped writing 1.1 by default, so there shouldn't be much of
a need to write such files any more - and this commit doesn't even
remove 1.1 reading capability (because it comes for free so far).

Change-Id: Ie54fe31f83733ef944306c01301c0ec0e9bcb8bf
Reviewed-by: hjk <hjk121@nokiamail.com>

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

Change-Id: I4c19a5f76b8605134aeab29130a20df187f8f107

Aero-Style-QWizard: Remove special handling in Qt Designer.

The wizard now behaves nicely when used as a child widget.

Task-number: QTBUG-29904
Change-Id: I2e9705eb4197b3411c9e072d0d5c05a97df8d47f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

List supported file formats in search indexing.

The supported file formats is implemented in
QHelpSearchIndexWriter::indexableFiles() function.

Task-number: QTBUG-30110
Change-Id: I4b68d765da6769b52b74f7fa4fbc1a1bcbfd4e08
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Fix warning about superfluous parentheses (CLANG).

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

Qt Designer: Remove unused code (detect by CLANG).

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

Enable Active-X plugin in Qt Designer.

Task-number: QTBUG-29733

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

Fix moving widgets in horizontal layouts in RTL mode.

Task-number: QTBUG-25872

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

Active X plugin: Fix setting a control by task menu.

The property is a QString when set by the menu or a
PropertySheetStringValue when loading the form.

Breakage introduced by
8695c1753964eeb06b5d9306010b56be5fc151c0 .

Task-number: QTBUG-29234

Change-Id: I84c3de80b99c8a20aaf1f8f7289882b0092d6a0a
Reviewed-by: Andy Shaw <andy.shaw@digia.com>

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

HTML improvement

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

define MODULE_VERSION

Task-number: QTBUG-29838
Change-Id: If7a85b5bf9701b1f804091b645b7de6554d4a27d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

Use qmake for package dependency resolution in cmake tests.

This allows us to remove hardcoded depends information.

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

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

Change-Id: Ic736c7169dc07599f43ee8317cca78da42131e1a

nuke sharedcomponents.pri

it doesn't actually do anything useful for quite a while

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

Merge branch 'stable' into release

Change-Id: I29715c906d4d4dee985fdcfbae9a5d99c1a17997

Rich text editor: Add support for Right-to-Left blocks.

Task-number: QTBUG-9502

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

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

Change-Id: Icc911c4f334091c0e1ece149ac68fab25ca07bd0

Add license files mandated by (L)GPL.

Currently only qtbase includes the required LICENSE files, which
are referred to from the code headers. The same files should
be distributed as part of all the modules as well, so that the
(L)GPL licenses are adhered.

These files were wget:d from:

https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL

As an addition to above, added also LICENSE.FDL. All the modules
additionally require it, since they include at least *.qdoc files and in
some cases a couple of others.

File received via
wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL

Change-Id: Ia9dd91fb4defea000d3df79006eba65e549a99e1
Reviewed-by: Jason McDonald <macadder1@gmail.com>

Add Linguist comments to palette editor preview widget.

Change-Id: Ib2cffaddacdddcc84070310a7f8e7c387ef3972a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

Remove QPointerBase bic check.

QPointerBase is not public or exported and it is to be removed

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

Doc: Edited Qt Help page and clarified .qhp file location.

-replaced "html" with "HTML"
-noted that the .qhp files are in the HTML directories

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

Ctrl+W shortcut on last open tab causes Assistant to crash.

Task-number: QTBUG-29499

This happend as nobody did inform the menu about the page changes,
the shortcut remained active even for the last viewer. Also make
some constructors and functions private, so we can no longer mess
from the outside with the viewers, except thru OpenPagesManager.

Change-Id: I2675996d4b30ab8b1db657e5157b497a73b96196
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Fix CONFIG of tool-plugins.

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

QMakeParser: save one ByteArray construction

Change-Id: I2845fdefb8b32de227f08017e0e3ad98923d1c87
Reviewed-by: hjk <hjk121@nokiamail.com>
(cherry picked from qtcreator/52be02d1cbbf69d4f82c517c7b633ed3d13b1007)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Remove braces for single lines of conditions

#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from qtcreator/29a93998df8405e8799ad23934a56cd99fb36403)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

fix doc page urls

they are versioned nowadays

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

Do not use webkit in case of static build.

Since linking against a statically build qtwebkit fails, fallback to
use QTextBrowser. I guess we need to fix static webkit builds first.

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

Qt Designer: Fix message about file open failure.

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

substitute fixed version numbers in qdocconf files with variables

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

support alternative and multiple suffixes in $$resolve_depends()

this is undeniably a new feature, but it's needed for a bugfix.

Change-Id: I951a3128eb580404ee0c7e3cdcb4d6170e899f70
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/87054805872429c1c17135f9ae5364b050d3fdff)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

don't flush qmake command line twice

otherwise variable assignments (including -config options) from
$QMAKEFLAGS are lost.

Change-Id: I818e9372d2b0ff44333dc3eb8fc3420f84ab01c5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/864e1ceaf628e823103ae2d28d2c983400ba38c7)

qmake:Add a case sensitivity flag to ProString::{starts,ends}With()

Change-Id: I457cd8288ae8a0138f7b28321fe87be3308b5215
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/4d55b473b3a1514c53dc5ee8116e2c86e4f62eb6)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

add base parameter to ProString::toInt and ProString::toShort

Change-Id: I0c8b48e6491486ca829ce24ca2e284294ba0138a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/9a1183b400748aa51132dd17d004d9d6e560b5b8)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Merge "Merge branch 'release' into stable" into refs/staging/stable

QtDBus-tools: Remove module includes.

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

Merge branch 'release' into stable

Change-Id: Ib896ae10a70d72eb671edba52ad29a1f7c8a73a7

Look into the right variable to determine whether Qt is built statically.

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

FilterWidget: Fix valgrind warning about uninitialized variable.

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

Fix crash (QFont access) by using a qt gui application.

Task-number: QTBUG-29218

Change-Id: Id7a926dce61cfac2a8c67ffaee52d305604cb34f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Remove QT_{BEGIN,END}_HEADER macro usage

The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.

Change-Id: I208ae87694deeb4edc73bb1a4be314c30861910f
Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>

Use path() as we need the path without the filename

On Windows, filePath() was used for a function that was supposed to get
the bin directory for Qt. However path() should be used instead as this
will remove the filename from the originally obtained string.

Change-Id: I16f8bda91fe9666c935318f8d73c715d2ea908f5
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Update changes file for 5.0.1 release

Change-Id: If70f67f3b8f9a2230cccff8a2682a7f1dcecfb73
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

tst_bic: Add bic data for linux-gcc-ia32

Adding bic data for the following modules:

 - QtCLucene
 - QtDesigner
 - QtDesignerComponents
 - QtHelp
 - QtUiTools

Change-Id: I1886fa9f6659c0a97d6b428d4667cd032f06afbd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Doc: corrected reference to customwidget.pro paragraph

Referred to par 1. Corrected to 3.

Task-number: QTBUG-29101
Change-Id: Icaa0e4eb06f24fcc7f2d369401fa8f49ed3b1d29
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

ActiveQt Designer plugin: Load control string correctly.

Task-number: QTBUG-29234

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

Qt Designer: Use multiline validation for dynamic string properties.

Task-number: QTBUG-26394

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

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

Conflicts:
sync.profile

Change-Id: I9871b004cc76d14d34f4a904cd7a8e4f8e2bb91a

Doc: Corrected spelling of Qt UITools in formbuilder.cpp

Linked to landing page

Task-number: QTBUG-28623

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

Compare only clean path. Fixes compares with /./ in path.

Change-Id: I980dce2e294d81e6486345d13b15deaf568340bf
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Remove all Trolltech references.

Change-Id: Idad55a5e6d87ea5703681e3ef11fc35ce9ff84eb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

doc: Fix namespace version to 5.0.1 for qhp documentation

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

Fix the missing webview Qt Designer plugin.

Task-number: QTBUG-29031

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

Update copyright year in Digia's license headers

Change-Id: I9b11dc8309c9739955e3acea12b564d6ad608f59
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Fix examples "make install", missing the doc files.

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

Deploy the mediaservice plugins if QtMultimedia is used

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

Revert most of 227a60a427f83931ca8bdaec7509a673738f053b.

The help engines findFile() does already resolve virtual folders in
different namespaces, so the added code was superfluous. It did not
even work properly... Implement a redirect network reply, so when a
file from e.g. qtwidget is linked into qtcore, we will get the valid
url set inside the address bar. This also fixes "Bookmark" handling,
"Sync to Contents" as well as "Copy" and "Hover" actions.

Change-Id: I418af5962d9f1d9970febb07f8f1c52e9995c58c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Fix search for non-existing term with filters turned on.

Task-number: QTBUG-26733

In case we search with attributes, all fields including the actual
search term needs to match. Otherwise we will find all pages with
matching indexed filter attributes, but ignoring the search term...

Change-Id: I691afb839a4175e800ab71a40ead7963f3c54c31
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Fix Assistant search crashes with square brackets, etc...

Task-number: QTBUG-28700

In 8f83747d12 escaping of special characters got lost in translation,
though it is required since some of these, like [] are field separators
inside clucenes index file. The full text search throws exceptions if
it encounters un-escaped field separators.

Change-Id: I5e457f95db426554d29bc33bea00a92fb6cfcba5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Merge from Qt Creator. Adds geometry awareness.

Task-number: QTBUG-22619

Change-Id: I34cd11c1021592560776e78452072c335b1ead21
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

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>