Change-Id: I3ae9d748d7218337f124e6713f6327861b486770
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

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

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

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>

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>

Change-Id: I5b71788a8d02b27d99841768d7fcbc2aa8e81766

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

Change-Id: Ic3edfb9336b0e56f887f7cc7315d35f4e6110362
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>

This starts Qt 5.1 release cycle

Change-Id: Id15d554ef88f18638f2662abb6611faaa1a72e05

- 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>

Conflicts:
	src/activeqt/container/container.pro

Change-Id: Ic830ce2220991e5c43966251a32f5b5032abcd01

Change-Id: Icf07a52714047b64da742762dff1b25346a313a9

Change-Id: I14b1bf27e79f760bad399e1e5a39cc05d774eabd

Adapted qdocconf + qdoc file to new folder structure

Task-number: QTBUG-29101
Change-Id: Ifd8e379915bf0bf612e9211b93cc53636d156f94
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Some of the functions were referenced but not implemented as they were
implemented in qaxutils.cpp. Therefore they need to be compiled into the
library.

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

Task-number: QTBUG-29838
Change-Id: Ieef1d6274089352f5a4ee7a57f9ddbe39a21fbe8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

Change-Id: I68995b86daa2caaa1806107631edaeb2d8dc66c3

Change-Id: Ia85d4c2258973034b04eab63e5b52e5c207b6283

In multiple.qdoc: replace \snippet with \input
Replaced statement "snippet" with "input"
Replaced "*;" with "*\"
Replaced raw-endraw with code-endcode
Replaced "raw" with "code"
Put code-endcode around numbered paragraphs
Resolved conflict in simple-demo.qdocinc

Task-number: QTBUG-29101
Change-Id: Idceb971d56551bf9e8bdce410360d418747731fe
Reviewed-by: Martin Smith <martin.smith@digia.com>

Currently only qtbase includes the required LICENSE files, which
are referred to from the code headers. The same files should
be distributed as part of all the modules as well, so that the
(L)GPL licenses are adhered.

These files were wget:d from:

https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL

As an addition to above, added also LICENSE.FDL. All the modules
additionally require it, since they include at least *.qdoc files and in
some cases a couple of others.

File received via
wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL



Change-Id: I7acca59e13988612a7382d84cad280d2cc6a091b
Reviewed-by: Jason McDonald <macadder1@gmail.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>

- 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>

it was previously skipped - probably because it contains QT+=widgets.
it's still a command line tool, though.

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

they are versioned nowadays

Change-Id: I67fc2d9c9b9a9096b3351b72ea94e7fc96f98382
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Change-Id: I190f17d778a9a87a89f4ffe4f2bacec7e6e1014f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Change-Id: I4c6c9ec0868de12f01b5a91a8d21ca441bb192a1

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>

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

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

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

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

Change-Id: Ia19cb01ac9f0c5e3863e684d2f701ac424ba64f4
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Change-Id: If66343daf53d9a5fc6eebd67b1c5dcfd7d219f55

Conflicts:
	sync.profile

Change-Id: I1bca8b78106fba1846ad8513f02f650d418b773e

Task-number: QTBUG-26065
Change-Id: I48852313fa05cdf8c0736f9ad821ccc0a0f0e152
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

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

Add source files generated by qmake for automatic static plugin
imports to .gitignore.

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

The event loop doesn't get initialized properly until first time
processEvents() is called. An in-process control that links Qt
statically constructs its own QApplication instance, but nothing
calls processEvents() on it to kickstart event processing, so
the control is unresponsive until something else causes that.

Fixed by explicitly calling processEvents() once after QApplication
instance is created.

Task-number: QTBUG-28716
Change-Id: Id50054082c75d9dce2fb12f0d44fa36601a8fc39
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Normally static plugins are only imported for applications, but
any dll implementing an ActiveQt server also needs these imports,
so add force_import_plugins to MODULE_CONFIG of QtAxServer.

Task-number: QTBUG-28215
Change-Id: I7c221dfd08ca25ba1a9c5246ed4517d00737922f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Change-Id: Ia59ccb4a3291c46efb5b15840bea2f988af99d48
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

qt is already added by spec_pre.prf.

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

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>