pixeltool: Display cursor position in title bar for measurements.

Change-Id: Ibc6d92dc9fb52989ea4d82e971cfc215d3f49f33
Reviewed-by: hjk <qthjk@ovi.com>
Replace deprecated QPixmap::grabWindow() by QScreen::grabWindow().

Change-Id: I9ca2576c5553d37cf25fcfd2934ade0d1bcb7fb0
Reviewed-by: hjk <qthjk@ovi.com>
sync.profile: Point dependencies to 'refs/heads/dev'

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

This is good enough for the time being.

Change-Id: I40b8d45fa5f6106912ad0a5f9ae69fae7b9ec660
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	sync.profile

Change-Id: I9871b004cc76d14d34f4a904cd7a8e4f8e2bb91a
Qt Designer: Use multiline validation for dynamic string properties.

Task-number: QTBUG-26394

Change-Id: Idbaa4bad71125b74d8407bb56ee9fdbf83831fe0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
ActiveQt Designer plugin: Load control string correctly.

Task-number: QTBUG-29234

Change-Id: I5762c75efc24bf5322ff767a9dbecfdfc02c3377
Reviewed-by: Jarek Kobus <jaroslaw.kobus@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>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Icc911c4f334091c0e1ece149ac68fab25ca07bd0
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>
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 remote-tracking branch 'origin/stable' into dev

Change-Id: Ic736c7169dc07599f43ee8317cca78da42131e1a
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>
HTML improvement

Change-Id: If70901325b3f4d5cbda705e4261fc18ea97c1bc0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
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>
Fix moving widgets in horizontal layouts in RTL mode.

Task-number: QTBUG-25872

Change-Id: Ia311b88f0ed3450d798bc5a9136e978c642d5b25
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>
Fix warning about superfluous parentheses (CLANG).

Change-Id: I0fa2c6d5bf04bb3cf9d0314207ccb0a21b928f22
Reviewed-by: Jarek Kobus <jaroslaw.kobus@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>
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>