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>

Add the CMake directory created during unit testing to .gitignore.

Change-Id: I6835b9c034ab3ba1933bd8726c035a8c328daa4f
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>

Generate a fatal error as appropriate.

Otherwise, subdirectories under directories which are added to
a resource file generate garbage in the binary.

The easiest way to see this is

 cd tests/auto/corelib/kernel/qvariant
 mkdir stream/qt4.9/somedir
 make && ./tst_qvariant loadQt4Stream

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

Export qhelpgenerator for use with qtPrepareTool()

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

Fix typo qith -> with

Change-Id: I71ee5f14c91f4265b71a1f097187408fb70f0867
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>

Enable modularization of translation files.

This is accomplished by introducing dependencies to catalogs.

Task-number: QTBUG-26138
Change-Id: Ia05918e1e043366ae0bf992f461275592f566c61
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Update the export macros in qttools.git

Use the new, simpler QT_STATIC macro.

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

Change CONFIG += staticlib to CONFIG += static

That's the targetted, correct way of defining a static library.

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

use centralized handling of QT_BUILD_PARTS

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

QtTools: Replace CONFIG+=help by QT+=help

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

"export" the linguist tools for qtPrepareTool() use

Change-Id: I2f7dee558e286e81b0f6a79bc428d1e5cda3321a
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>

Don't change the current page of mainwindow container

Task-number: QTBUG-12097

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

Designer: Fix crash when switching from docked to multiple windows.

Make sure the preference dialog is destroyed before changing the
UI mode by introducing a flag that is set on UI mode changes,
triggering the update afterwards.

Change-Id: I9c488ba6b1b24faccb0a1606994aaf0474b56fc2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>

Run the cmake unit tests as part of the qttools CI.

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

Fix compilation

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

cetest: remove support for X.sources of DEPLOYMENT variables

The .sources property has been deprecated in Qt 4.8.0 and
will be removed for Qt 5.

Task-number: QTBUG-3216
Change-Id: Ib37ef0913ddb16c89578f75277c41c27e2d8cdd1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

Copy the LinguistTools macros to the build directory.

Allows running the unit test before installation.

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

Fix cross compilation

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

Port QStandardItem/QStandardItemModel includes to QtGui

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

Create a Qt5LinguistTools config file in the build directory.

As it is not using qt_module_config, it is otherwise not created there,
which breaks CI.

Change-Id: Ia4264d721a4f4a70542bc50329fd77def23d3914
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

remove stale reference to QTDIR_build

the flag is never set anymore, and the condional requires() would never
be true, either.

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

Merge branch 'buildsystem'

Change-Id: Ibe002ec394142f4e2d36a6d7e1fc0e1239a68672

QtTools/Linguist: Replace Q_WS_ by Q_OS_ where appropriate.

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

purge QT_(SOURCE|BUILD)_TREE usage

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

build system cleanups

- load(qt_module) => load(qt_build_config)
- remove:
  - CONFIG+=module (obsolete)
  - setup of PKGCONFIG* variables (automated now)
  - code relating to module version headers (automated now)
  - %mastercontent assignment (automated now)
  - pointless QPRO_PWD assignments
  - qmake -project boilerplate

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

auto-generate module pris

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

Clucene: Fixed MSVC2011 build.

This is basically taken from Qt 4.8 /
69f84b9514f8f22d27590ac890dbd20aec369702.

Clucene is broken in MVS2011 due to changed stdext::hash_map which
is used as the ancestor in inner CLucene classes. It ended up with
names collision and double inheritance from the one base class.
Fix reflects that change.

Change-Id: Ia733c3b51dafc5d22674cc3822e6305819582429
Initial-patch-by: Eugene Shcherbina <eugene@eshcher.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>

Allow the specification of includes in the lst-file in lupdate.

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

Use app.arguments().size() instead of argc in the for loop

We're looping over the contents of arguments() anyway, and it is
more future proof to consider the size of the container in case
QCoreApplication ever consumes arguments like QApplication does.

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

Fix dependencies of the QtTools module.

- Remove phonon designer plugin.
- Disable the ActiveX designer plugin, which will later be moved
  to the ActiveQt module.

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

Handle files with includes from extra directories with lupdate.

Forward port of 7a6d2796e63a8a390bd86fe9a029c4add119132b in cmake.git.
Change-Id: I35d05a6160e192e9ea0966fdd2ebc21ce2d73d24
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

use depend_includepath

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

Explicitly set QFormLayout::ExpandingFieldsGrow.

Mac has a different default value, causing the fields to have
a static size.

Task-number: QTBUG-26222
Change-Id: Ib983162dbfd61d083c842f87eac1570ae7dc3a7a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Fix designer build with QT_NO_CLIPBOARD.

The required variable was inside incorrect scope.

Change-Id: I4e6c7378ab3a2f44143640de67d7765eeb4d7030
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix building of qttools when printsupport module is disabled.

The source code already has necessary #ifdefs in place, but dependency
to printsupport library wasn't conditional in *.pro files. Made
printsupport conditional also in *.pro files.

Change-Id: I0bcc4765d5f848dc5334fd380671989a9cc27f74
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

clucene: Compile with clang's libc++

When using clang's libc++, the 'using namespace std;' in CLucene's
StdHeader.h causes ambiguity between wcschr() from wchar.h and
std::wcschr() from cwchar (which is automatically included by libc++).

The only symbols used from the std namespace are std::min() and
std::max() so only pull these in, not the whole std namespace.

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

Fix windows build due to min/max macro clash

qdatetime.h uses std::min/max and windows system headers like to redefine
min/max. Include qt_windows.h instead of windows.h to include a workaround
for this conflict.

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

Use new signature for message handler

The const char * argument got replaced by a QString one.

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

Remove QtScript and QtQuick1 dependency

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

This plugin has moved to qtquick1

This somewhat untangles module dependencies, and removes
the qtquick1 dependency from qttools. It also leads to
compiling the designer plugin for a module together
with the module.

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

Remove obsolete BIC data

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

do not delete a literal constant

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

Fix static init issue on MSVC2010 with HelpEngineWrapper.

Change-Id: I4ffcde027d075f5556031bc40e3635202dd10726
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

Remove the remaining traces of the old plugin system

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

fix path to module pri file

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

Fixed CeTest remotelib build for WinCE 5.

WinCE 5 does not have PPN_POWERBUTTONPRESSED but PPN_SUSPENDKEYPRESSED.
Newer WinCE version have both, but PPN_POWERBUTTONPRESSED is defined
to same as PPN_SUSPENKEYPRESSED, that's why it is safe to use
PPN_SUSPENKEYPRESSED in all WinCE versions.

Change-Id: Ida0604f86330c3e833a1ad41a88db55aa6a625fa
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
(cherry picked from commit 15f84271e8eb47a035ad572fb3db81171f354839)
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>

Prefer QMetaType over QVariant during a type information query.

As a side effect the patch probably fix special case, when an interface
wants a variant and one of the parameters has to be converted. Before
QVariant::nameToType was returning only builtin types ids.

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

Qt Designer: Update copied rcc-code to contain the correct hash function.

This fixes icons not showing in the resource editor or style sheets.

See qtbase:ddb70bee2fd323ddc4273aec5d40d975f50d2904

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

QtTools: Fix usage of deprecated QCoreApplication::translate.

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

Update the includes after QIcon was moved to back to QtGui

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

sync.profile: remove dependency on qtsvg.

sync.profile should not reference modules as dependancies unless they
are actually required; update sync.profile accordingly.

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

Fix warning with GCC

warning: converting ‘false’ to pointer type ‘QWidget*’

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

Build fix.

QVariant doesn't have QKeySequence constructor in Qt5 (effect of
the modularization project), therefore it can not be default
constructed.

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

Doc: Fix \sa usage

Ensure comma between elements (1 missing), single space and curly-
braces around title elements, etc.

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

Fix deprecated item view methods in Qt Designer.

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