qdoc: Never use a collision page as a main QCH landing page

When writing the main/landing page for a documentation set to
a .qhp file, check that it's not a collision page. If it is,
default to 'index.html' instead.

Task-number: QTCREATORBUG-11035
Change-Id: I0269834f6e50fcf5ae779c026263e69e4c3cd7b6
Reviewed-by: Martin Smith <martin.smith@digia.com>
Remove unused variable

This fixes clang a clang warning:
src/plugins/platforms/kms/qkmsscreen.h:114:18: error: private field
'm_refreshTime' is not used [-Werror,-Wunused-private-field]
    unsigned int m_refreshTime;
                     ^
                     1 error generated.

Change-Id: I850f676abbde595963373afaf630307042dbf5a7
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
QFileSelector: correct the macro for android platform

Task-number: QTBUG-35073
Change-Id: I50d254ae61dac3cedc11291bd5ed35f9f9447622
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Remove duplicate move assignment operator doc

Keep the "since 5.2".

Change-Id: I8cfaf81e0b10f67c084e923f846ce0c722eac7fe
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
QPlainTextEdit: set Qt::ImhMultiLine

Like QTextEdit, QPlainTextEdit should also set the
input method hint Qt::ImhMultiLine.
An important reason for this, is that the iOS plugin
will inspect the input method hints of the focus
object to decide which type of keyboard (and return
key) to use. Failing to set this hint will result
in the iOS plugin setting the return key to 'done'
instead of 'return' for this widget.

Change-Id: Idd5aaf21505add608f2621f94655984f42e92a18
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Load all available pixmaps in an icon file.

Fixes the problem that only the first icon would be read from an .ico
file with muliple icons of various sizes in it.

Task-number: QTBUG-28267

Change-Id: I50daa89769054234e9ffc5246f59b46975948871
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
set empty PDB file name in release config of VS 2012 vcxproj files

In release configs qmake sets DebugInformationFormat to None.
If ProgramDataBaseFileName is left unset, then VS 2012 will always
rebuild the complete project. Therefore, qmake now inserts an empty
ProgramDataBaseFileName tag if DebugInformationFormat is None.

Task-number: QTBUG-35570
Change-Id: Ifb91b0bbcf6614621bfe3b12429e2624bd16e77a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
QNX: Fix build on Win32 when linking against sqlite libs

Previously the linker options were overquoted which resulted in
a broken Makefile.

Change-Id: I2a77ad07564fc75533d6e8f29b5cbe52389bcce5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Doc: argument(s) was renamed to value(s), adjust QCommandLineOption docs

Task-number: QTBUG-36264
Change-Id: I132270f35b93b2b1c5230459f48bf9d047f42ab9
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Also register complex D-Bus types when running under qdbus

When running inside qdbus, we generate the meta objects a little
differently. Previously, for unknown types we'd simply have a -1 as the
type ID in the meta object, but this doesn't work in Qt 5 (has
apparently never worked). So simply register a type with the metatype
system and let QMetaObject do its thing.

[ChangeLog][qdbus]Fixed a bug that caused the qdbus tool to crash
when trying to display remote interfaces that had complex types
without a matching base Qt type.

Task-number: QTBUG-36524
Change-Id: Ifef65b340dc89d3295ed6ef00f2dcc60849ecb02
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Documentation: a singular subject takes a singular verb.

Change-Id: I75762cd0f2c25eeeeb1283800c21393637bdff56
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Build on Windows Embedded when -qtlibinfix is used

The resource file that needs to be included is hardcoded whereas qmake
generates one that is based on the target name (which includes the
libinfix). So to ensure the right one is available, a copy of the
generated rc file is done to the name it expects.

[ChangeLog][Platform Specific Changes][Windows Embedded] Fixed building
issue when configuring Qt with -qtlibinfix

Change-Id: I46ddbc5d22424bf63c54423618385e4268790eeb
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Upgrade Window Level for stay on top widget on OS X

Currently setting the WindowStaysOnTopHint makes the window appear over
its children e.g. a QMessageBox.

This patch aims to provide a more sensible level for stay on top widget

[ChangeLog][QtWidget][OS X] Fixes an issue where stay on top widgets
would cover their own children

Task-number: QTBUG-36178
Change-Id: Ie86b0e0244d2fdee3638d4ab576445ef190d4bc6
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Update some screenshots in qtbase/examples/widgets.

The screenshots were taken on Windows 7 with the Aero theme.

Change-Id: Ief04c3a9c0084a778606ba72f1f3199119d5c64e
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Doc: corrected link/example errors

Update pro files after move gestures folder
Update snippet statements
Corrected path in imagegestures.pro

Task-number: QTBUG-34749

Change-Id: Icc19908914e36507e412ab63bf0cc2809aa48e17
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Update some more screenshots in qtbase/examples/widgets.

The screenshots were taken on Windows 7 with the Aero theme.

Change-Id: I2517664e25389f4fb87408daec7b720dfb785bf0
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Add the default argument for the new connection syntax

Task-number: QTBUG-36549
Change-Id: I3addacf4b0698df91960f7b8e9c2ed93e935f848
Reviewed-by: Branislav Katreniak <katreniak@gmail.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
CMake: don't require GL when build with -no-opengl

Task-number: QTBUG-36509
Change-Id: I03451527ab91754d87ff2a43985952c7c7641826
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Fix QByteArray documentation w.r.t. QString-related methods

There's no loss of data when converting a Unicode string to UTF-8,
so don't state that in the docs.

Change-Id: If26914ec674a994d9c59136448e8e4292d0412e8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
QLogging: Avoid infinite loop in error case

If the user code installs a message handler that uses
any API that prints logs (handled by qt_message_print)
then this will lead to an infinite loop.

This patch adds a thread local storage to check
if the message handler is done before the thread
is calling it again.

Note: This check is performed only if the compiler
supports thread_local (__declspec(thread) for MSVC).

Change-Id: I43b0460b8f39b26a18de48a5652a5e55f0b336f8
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>