fix bootstrapped build

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

adjust fake QCoreApplication::translate() to qtcore changes

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

remove stale QT_NO_TRANSLATION ifdefs

they are from the times when these files were part of the qt api

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

fix non-qmake build of the evaluator

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

rewrite default spec handling

instead of symlinking (on unix) or creating a forwarding spec (on
windows), just put the default specs into (the bootstrapped)
QLibraryInfo.

Change-Id: I595500ef7399f77cb8ec117c4303bc0a2ffe505f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from qtbase/7d20f3dd1065a20b40cb4689783fba05190fe317)

Fix qmake's pro file cache to interact correctly with write_file

When writing a file with write_file() we have to inform the pro file parser
cache to discard the file if it's existant in the cache, to ensure that
calling include() after write_file() always works.

Change-Id: I7d09269a57de55ca30b0e11dd40770de9f919f64
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/f45d6414ad6ef1d75f049a61411cd954bcae29c3)
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Use QStringList::join(QChar) overload where applicable [qmake]

This is an automated change performing the following replacements:
                    join\("(.)"\) -> join('\1')
  join\(QLatin1String\("(.)"\)\)  -> join(QLatin1Char('\1'))
  join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1'))

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

qmake: add ProStringList::join(QChar)

Same reasoning as for 68e04c3ac148bcbe71f2deeb7288563f6cdbcab5 applies.

Adding the overload was easier than to teach a Perl script to distinguish
between QStringList and ProStringList instances...

Change-Id: I6de6ecf21fdad135ac213b5c794927a9bc120a92
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/cbf447069cfeb799ff5e09902be065d77f2e7707)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

resolve only one level of symlinks, and only for the default specs

otherwise we end up in the source tree, which is counterproductive.

Task-number: QTBUG-26869
Change-Id: Id44a94f827dc285c75b9b243c8ef6478e668e3ff
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/04cd23428a4f2cfa5ee02b70f2086ff832aae925)

fold m_qmakespecFull back into m_qmakespec

the original value is not used any more after the final resolution.

Change-Id: Icadc219f045a1bbfd20506c4c72c53d1fb352969
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/cc2cd0db5d0c53605ab93f796765667ead1920e8)

fetch all properties from qmake

don't filter out ^QMAKE_.*:
- QMAKE_MKSPECS is not printed any more, so needs no filtering
- QMAKE_VERSION can be simply used now, as we are now rather close to the
  real qmake
- QMAKE_SPEC and QMAKE_XSPEC need to be fetched
  - this fixes the default spec resolution

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

follow qt_tool.prf now setting up DESTDIR

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

adjust to qt_plugin.prf changes

DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.
TEMPLATE, some CONFIG flags and TARGET munging are unnecessary, too.

this contains a nasty hack for examples, as we don't want users to use
the internal prf files.

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

remove now unnecessary workaround for static linking of plugins

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

CMake: Remove obsolete test_modules test

The generated module_includes test is a super-set of this test.

Change-Id: I83606455c939152bdd871926979fcc44337754df
Reviewed-by: Rohan McGovern [inactive] <rohan.mcgovern@nokia.com>

CONFIG+=uitools is deprecated. Use QT+=uitools instead

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

CMake: Test module includes

Change-Id: Ib1b7440a4537cc934eeec78c5b5e1a1ffbcbd222
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Add WebKit as CI build system dependency

This module uses QtWebKit APIs, so make sure WebKit is available
when build-testing this module in the CI system.

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

qdbus: Don't print a newline on void replies

Only print something if there was actually something coming from the
peer.

Task-number: QTBUG-22482
Change-Id: I4536871484664ed3056cc20de7e49a176cf5a8b9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

Generate a ConfigVersion.cmake file for Qt5LinguistTools.

Change-Id: I1ea47da2d782693a16eb4ac9b8e69f6275da721d
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

Remove menu role conflict for preferences dialog

That conflict would result on the preferences dialog not being
accessible on Mac.

Change-Id: Ibd2e370c3e29f672d0df847ecf90ea1022a20fdc
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Display initial "new form" dialog as proper dialog on Mac

Change-Id: I0497eb1aaa6af39fcc5a766a810770e1fb0322ec
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Remove insignification from CMake tests.

The failing test is working, now that a fix has been added to qtbase.

Task-number: QTBUG-27087
Change-Id: I4e4a74a49cf080a94de582da22870f8c01797ad4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Use "QtProject" as organization name in various tools.

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

Qt Designer: Use "QtProject" in interfaces, organization name.

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

Adapt to QtWebKit module changes

The widget specific API of QtWebKit is split out into a separate QtWebKitWidgets
module. Assistant and Designer use the widget specific API and therefore
need to use QT += webkitwidgets instead of QT += webkit.

Change-Id: I57b829428e079f454560676c48536aae8de15ed4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>

Polish Qt Designer plugins and QtUiTools.

Do not use module includes, fix warnings about obsolete
CONFIG+=designer.

Change-Id: I6277f0e96a35171f22dced1a434a2c14c1e98d60
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Fix the use of Qt::GlobalColor with QVariant.

Before the patch, the code is setting an integer value, not a color.

Change-Id: I387759ac74149d5dea27ae59491682d63f37f843
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

Remove module includes from makeqpf, qev.

Change-Id: I5c8f8bd610bb9d83ef1feec204411163a4a170b8
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

Make the cmake test insignificant in QtTools on Mac.

Recent qtbase changes seem to have broken it.

Change-Id: Ie596e8b8b5bd8c6cb804c84808595a2388a2bfef
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

UiLoader: Map QLCDNumber::numDigits to QLCDNumber::digitCount'.

QLCDNumber::numDigits was deprecated in Qt 4 and removed in Qt 5.

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

Adapt to QUrl changes: URL with authority must have paths with /

Otherwise, QUrl considers the URL as invalid.

Change-Id: Idc33210ce75813ff8420da6efb7baf5511d43054
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Mark the cmake test here as insignificant.

The QtUiTools library, being a static library, is apparently broken
with the CMake MSVC generator.

Task-number: QTBUG-27087
Change-Id: I0e8a76c1d413fa845a4b803f08974a1907f18886
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Create IMPORTED targets for the linguist tools.

We already create IMPORTED targets for the qtbase tools
since qtbase/189a5d8af12788a30121210066de647a6dc3a167

Change-Id: I89a1c59b4e14f0f5bdc71dfca0165e625c779715
Reviewed-by: Brad King <brad.king@kitware.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

CeTcpSyncServer: Use qInstallMessageHandler()

qInstallMsgHandler got deprecated in Qt 5.

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

Build tools in release mode if using -debug-and-release option

Change-Id: I2d0f60e2fcba66460f5488c6f66432b76a06f05a
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

Better looking widget toolbox in Designer

I noticed that in many styles the widget toolbox looks rather
ugly when using the styled buttons. Instead I now draw simpler
and cleaner expander buttons.

Change-Id: I3559c8ffcae3e08a7b418c4238663af579bcc912
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Add missing border to the central widget in Designer.

QMdiArea doesnt draw a border by default so we have to add one.

Change-Id: I2ee53cd62989e92919c32a6774e3d02f86927bc1
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

Don't test linguist macros if cross compiling.

linguist tools are not bootstrapped.

Change-Id: Iae6b577db17be788a04036a06238191aa6896c01
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

make qcollectiongenerator a qt_tool

somehow i missed it during the global conversion

Change-Id: Iac9521c54da82dc5047210a6abf3e4bf526347e9
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Change copyrights from Nokia to Digia

Change copyrights and license headers from Nokia to Digia

Change-Id: If89e41b25a242ff376eacdf8790957bcf499cc66
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Remove ambiguous argument to createIndex.

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

make lupdate test significant again

everything seems to be passing

Task-number: QTBUG-25483
Change-Id: I342c68477793b2445c065a53e3d4cced56c0d97c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

remove hand-written manifest

it seems that with msvc 2008 (now the first supported version)
the necessary entry is added to the auto-generated manifest, so get rid
of the hand-written one.

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

make uninstalled lupdate & lrelease find qmake

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

make linguist test work with shadow builds

Change-Id: I8aefcd88f95f6527f62029cc8afc88d42b02ec33
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

support listing translation files as sources

source strings from such files are marked as obsolete; the only purpose
is collecting possible translations.

this is an obscure feature meant to facilitate the modularization of the
qt catalogs. it's hard to describe in a few words (the format needed for
-help), so leaving it undocumented (for now).

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

implement stand-alone getSimilarityScore() with StringSimilarityMatcher()

now that the instantiation is cheap, we can do that.

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

make StringSimilarityMatcher instantiation cheap

... by removing an allocation.

move some of the functions out of the class to avoid polluting the header.

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

optimize similarTextHeuristicCandidates()

no need to re-calculate the matrix for the reference string every time.

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

set the output directory for the qmake evaluator

this is necessary to make it find .qmake.super, which is necessary for
execution in non-installed top-level builds.

Change-Id: I8118363576ef19684cd17a6c0a23a7f8030b1104
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

support indirect SUBDIRS

that is, .file and .subdir "structs".

Change-Id: I6c7ea5971642802a97461d821cb1544fcc986013
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

less esoteric parameter passing to processProject()

just pass around fully qualified file names instead of QFileInfos.
a side effect of this is that error messages use full paths as well -
this can be considered good or not.

Change-Id: I55a7545064d32ac717ce9c57205ef59b76afc3f0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

update qmake evaluator to newest version from qt creator

Change-Id: I66ec46dd87f922094f6937b50cc40e02ef08cc86
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

sort <extra-*> tags

relying on hash sort order is no good idea

Change-Id: I314222bbfd94d29bad1cb7e8b6823b320a88ea75
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

check availability of qmldevtools, not declarative

that's the module we actually use

Change-Id: I928778a8638a8d0b2022696120dcaf6aa28a9d6d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

handle windows line endings in the qtdeclarative/js processor

apparently the parser does not do that any more, so do it here.

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

fix compile of tests

they need help-private

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

centralize load(qt_build_config)s in .qmake.conf

Change-Id: Ifbef0323f3a3fc80b10ac2c8c8a8a68ce646c1e6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

build valid URLs

the path must always be absolute.

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

Don't test QtTools modules if widgets is not available.

All public QtTools modules depend on widgets.

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

don't test assistant stuff unless assistant was built

the previous test whether tools are built is implied by that.

Change-Id: I3eb683c0dcaff1ebe3d51fae3e9b6ca4e4712169
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

make headersclean test compile with -no-widgets

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

CLucene: Fix compilation with win32-g++ and C++11

We plan to enable -std=c++0x for MinGW gcc. However, this let gcc set
__STRICT_ANSI__, and the MinGW headers then do not declare e.g. _i64tow.

Instead of working around this in clucene we just switch to less strict -std=gnu++0x mode.

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

Fix .pro-file warnings in examples.

uitools/designer should go to QT.

Change-Id: I00fe86bfcc6c500d6a277c0e79cb4c3ad54441d4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix warnings about unused variables in Qt Designer.

Apparently, the function declarations are a copy&paste error.

Change-Id: If42728b3c545fb93638e73566af5d8937fb5ced5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Remove checksdk

This was used to produce a Windows CE environment,
but nowadays its integrated into qmake. This makes
this tool obsolete, so remove it.

Change-Id: Ib1e1ee43132795cafa410a0eafe5b142177fae8c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

fix pointer abuse

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

lupdate: use QMAKE_MANIFEST to embed our special manifest file

Task-number: QTBUG-27080
Change-Id: Ieacc116ef091f0473f2c543a76685f7c851a2456
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix narrowing conversion compile error

Explicitly specify conversion from int to TCHAR to avoid a narrowing
conversion compile error when compiling with GCC option -std=c++0x.

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

Update the git-archive export options

The .gitattributes and .gitignore files do not need to be present in
packaged sources, as they are for people using the Git repository.
People who download tarballs usually don't reimport into Git -- they
should just download the actual repositories.

Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the $n string, ask git-archive to store
the SHA-1 of the commit being packaged.

Change-Id: I4525d2264d9ef92d978dc5e4186313709f8ba67b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

QtDesignerComponents: Avoid MinGW GCC cc1plus crash using PCH

MinGW GCC cc1plus crashes when precompile_header is used. This has been
observed with several versions of MinGW GCC from MinGW-builds and
MinGW-w64. Disable precompile_header when using win32-g++ mkspec to
avoid the crash.

Change-Id: I538563bf1dc0f45eb9cf0528ad8b95fc0e87b7e8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Make compile with -no-widgets

Change-Id: I8b725e8f600268ad3d2105eb2015bcf778adf48d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Return from main instead of exit()ing in qdbus

This way, the automatic variables' destructors will be run.

Change-Id: I2550969a0dde981f2de14be0ddaae285b68181db
Reviewed-by: L Potter <lorn.potter@gmail.com>

assistant: don't crash when run as non-gui in mac/linux

Also don't use obsolete QApplication constructor.

Change-Id: Ibe172e13caeccb08a388b0fe8ebbddf25c5ca0ec
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>

Make sure the parent widget still exists.

It may happen that InPlaceWidgetHelper's destructor
is called after parent widget destructor. Now inside
InPlaceWidgetHelper's destructor we check if parent
widget still exists.

Task-number: QTCREATORBUG-7684
Change-Id: I4c9ecbfae7323fd95345ccabc113218a7011ebe8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Continue processing the qhp file on missing attributes

qhelpgenerator would bail out with an error if a keyword would contain
a missing or empty attribute. This can e.g. happen on a missing
\relates in the documentation.

This makes the whole help generation rather fragile, as CI doesn't stop
these kind of errors from making it into the code base. So rather then
failing to generate the docs simply skip the one keyword that the
helpgenerator can't place into a context.

Change-Id: I265dc75ba9b29c868d5b9cf8a9aae5ce880374b1
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

Remove doxygen support files

These were only needed for phonon, which is not part
of qt5.git anymore.

Change-Id: I308fa1963ca7270a4e6ed1453bdde60dd3205329
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Small cleanup in the pro file

Qt Console edition doesn't exist anymore, so remove the
reference to it.
Adding x11 to the config also doesn't make any sense
anymore.

Change-Id: I8020a648575ef4482ffbe7d4f2c47dd5cc5eb143
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Fix deleting of QTreeWidget items.

Breakage introduced by
af617c319772a34115d0c4d802f25a807cb43065,
which caused the autoconnections to no longer work.

Task-number: QTBUG-26770

Change-Id: Id00341d93d4a830f3f48a1db6234818e6d262977
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Remove runonphone

runonphone was a pure symbian utility. Remove it.

Change-Id: I6fa1b7884fb86a161ff4f7f8ba7f54de687faa43
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Jason Barron <jason.barron@nokia.com>

Remove qttracereplay

This helper app only worked with the trace graphics system, something
that is gone in Qt 5.

Change-Id: Ib50216f4abdfb0f14e0afb1c164ce37590931c72
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

Use Qt::WindowFlags, not Qt::WFlags.

The latter seems to date from the Qt 1 days, and such abbreviations
are not current Qt style.

Change-Id: I2208e3d0db14220398d9b0249ab6f07c9859ba14
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

make use of QT_PRIVATE to specify private Qt dependencies

Change-Id: I6f347fc1ee6e3319545564dc3eadfe2fd330e25e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

follow rename of qt_module_config.prf to qt_module.prf

Change-Id: I20e609469de3cd050fd2ef0dceeefbf424249b44
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

remove manual linking of libQtClucene

the qt module magic handles that automatically nowadays

Change-Id: If67a83f50c1593461ec3abfc32132b594fd9ee18
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

Properly handle include cycles

Currently lupdate is just issuing a warning when it detects an
include cycle. Since it's not a full preprocessor, most of those
warnings are false positives, but they need special handling, this
patch provides that.

Now every result is stored as part of a cycle (so in the general
case a cycle of one file). When detecting a cycle, instead instead
of issuing a warning, we record the presence of the newly detected
cycle for later use and merge the other relevant cycles with it.
When retrieving results now it's not for a single file anymore but
for a complete cycle at once (which can turn out to be a cycle of
one file).

Task-number: QTBUG-6587

Change-Id: Ia12bc680e645b9704a3178e8a843a554a60811bf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Add support for modular docs in QHelpGenerator.

Very cool.

Change-Id: Ic3332a4a780fb357138545117e78be641d2ea14f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Prepare QtHelp library for modularized documentation.

- Support ".." in QCH documentation file paths.
  This essentially means that we stop using cleanPath, and where needed,
  prepend the virtual folder name, followed by "/..", in front of the
  original path.
- Remove com.trolltech default DocPath since this was not used anymore.

Done-with: Casper van Donderen <casper.vandonderen@nokia.com>
Change-Id: I7309805000f343e2f58c74cd0655a936399fd939
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

Add export macros to QtCLucene

QtCLucene is not the same library as QtHelp, so it can't use the same
macros and same #define as QtHelp.

Change-Id: Idefe46cbd8842f406131c8f041b531a92a2261a2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix a crash in Assistant.

Change-Id: I8fa3f5845db515d5f9efc74acd392058ef1e1ec5
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

Enforce sans-serif by default in assistant

Make the default font sans serif for HelpViewer's QWebView-based implementation
since it is what QTextBrowser uses by default, we probably want to blend in.

Change-Id: I07257d61cac9bffa28f90f31e352101b2e04cb0e
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

Set the Qt API level to compatibility mode in all tests.

Qt 5.0 beta requires changing the default to the 5.0 API, disabling
the deprecated code. However, tests should test (and often do) the
compatibility API too, so turn it back on.

Task-number: QTBUG-25053
Change-Id: I73b99cd8e948dbebcdac30c4e5f2772eacb958ab
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

Non-UTF8 encoding for source code is deprecated.

So the encoding marker for translations is unnecessary. It's always
UTF-8 now.

Change-Id: I2013451f917fa6b58125a6cf3cd5db6c99ab0ff2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Restore the forms/ subdir that was lost in the uitools reimport

These files are referenced in the .qrc file, so they are necessary
during compilation.

The files were copied from the commit referenced in the initial import
of the qttools.git repository.

Change-Id: Id1f182a7a9dd4e08e63fb903b978de192b85cd98
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

QHeaderView::setResizeMode is deprecated.

Replace with the Qt 5 name setSectionResizeMode.

Change-Id: I908e669708c3595f110e41774475eea4cbdb7325
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

Remove phonon as per removal in qt5.

5fb5e0dfc7d794df882408d4c7b6c0e14073282b removes qtphonon from qt5
compilation, also remove it in this repository.

Change-Id: I31a3dd4a47bab49039af00b5e385eed61a1cc35c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

make lupdate compilable without qml/js support

In case the declarative module is not present.

Change-Id: I2652b245506e2a04c4e588f62de2a39ebf652677
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Mark QCLucene and QtDesignerComponents libraries as internal.

The QCLucene library is obviously internal, and the only headers installed
by QtDesignerComponents are apparently pch headers.

This causes the avoidance of creation of CMake files.

Change-Id: Icb0b7e4ad622af3b2bc37043678dd6dc134be724
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Test that the package configs for QtTools work.

Change-Id: I366c5f0a964739cc0fc607c72cf1e42d7ea92f06
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>