dumpcpp: compile with QT_NO_CAST_TO_ASCII

Change-Id: I96750ea25c6b4499dccf55509510c076bc4ad371
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.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: Id328f169004a6cb69078b58801885b00581fee33
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Testcon: Fix includes.

Replace module includes by per-class includes.

Change-Id: I5c70aa194b4066ef14082af79f396a635bf8475f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	sync.profile

Change-Id: I1bca8b78106fba1846ad8513f02f650d418b773e
Fix compiler warnings of MinGW in Active Qt.

- Assigned/unused values
- Unused code
- Constructor order
- Comparing different enumeration types

Change-Id: I2cc0db554ed87296689303bbbb1978afa2c532b9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Check return values of CoInitialize().

Change-Id: I97e94517e1fb1af89d992db9c1a8c15aba5f8425
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Remove QT_{BEGIN,END}_HEADER macro usage

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

Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html

Change-Id: Ifbece10f535a54baf4230ffcbc11ce0c1972d740
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Improve QAxSelect dialog.

- Add filter widget from tools (slightly modified to contain
  the image as XPM). Add filter model, wire signals
  accordingly, add handling for the case none is selected
  (disabling the "Ok"-button).
- Use QDialogButtonBox instead of Buttons
- Remove obsolete context help button.
- Maintain "Binary compatibility" by replacing the QScopedPointer
  of the UI by a private class.

Change-Id: I1f4740cab6845525e0a71a3096feb2f2a4b2172a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I68995b86daa2caaa1806107631edaeb2d8dc66c3
Doc: snippet issues with wrapper-demo

Adapted qdocconf + qdoc file to new folder structure

Task-number: QTBUG-29101
Change-Id: Ifd8e379915bf0bf612e9211b93cc53636d156f94
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I14b1bf27e79f760bad399e1e5a39cc05d774eabd
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Icf07a52714047b64da742762dff1b25346a313a9
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/activeqt/container/container.pro

Change-Id: Ic830ce2220991e5c43966251a32f5b5032abcd01
Doc: several snippet issues in multiple.qdoc

- added path to qdocinc file in qtactiveqt.qdocconf
- removed unnecessary snippet label from multiple-demo.qdocinc
- modified path to qdocinc file
- removed reference to directory name,
  input statement now only specifying file name multiple-demo.qdocinc

Task-number: QTBUG-29101

Change-Id: Icc957907cfcbab97a01ffec07819f667961644b8
Reviewed-by: Martin Smith <martin.smith@digia.com>
Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: Id15d554ef88f18638f2662abb6611faaa1a72e05
Bump MODULE_VERSION to 5.1.0

Change-Id: I5be8b6f802045cc1c649f9fd200042775a04909c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I5b71788a8d02b27d99841768d7fcbc2aa8e81766
Doc: Remove instructions for using qtdemo from examples README

The Qt Examples and Demos Launcher is not maintained anymore. Edit the
README to mention Qt Creator as the way to find and launch examples.

Task-number: QTBUG-28388
Change-Id: Ic907e2a430571a0f5b3dc1ff8582c3d296ef1682
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
fix memory leak in QAxServerBase::internalActivate

There is no need to call QStringToBSTR, because the method
IOleInPlaceUIWindow::SetActiveObject expects an POLESTR, not a PBSTR.

Task-number: QTBUG-30890

Change-Id: I98e42d400400cae849198d2d9c7cbb9c6de7991d
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
idc is a host tool

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