Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I8c55a2177a3daac033165a7601c574ecfdd4f658

6 files changed, 55 insertions, 35 deletions

diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2
new file mode 100644
index 0000000..708a382
--- /dev/null
+++ b/dist/changes-5.0.2
@@ -0,0 +1,22 @@
+Qt 5.0.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0 and 5.0.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.1.0 b/dist/changes-5.1.0
new file mode 100644
index 0000000..505b0cc
--- /dev/null
+++ b/dist/changes-5.1.0
@@ -0,0 +1,22 @@
+Qt 5.1 introduces many new features and improvements as well as bugfixes
+over the 5.0.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.1
+
+The Qt version 5.1 series is binary compatible with the 5.0.x series.
+Applications compiled for 5.0 will continue to run with 5.1.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/examples/activeqt/README b/examples/activeqt/README
index 24be2de..1cadf08 100644
--- a/examples/activeqt/README
+++ b/examples/activeqt/README
@@ -3,37 +3,7 @@ have been written to provide developers with examples of the Qt API in use,
 highlight good programming practice, and showcase features found in each of
 Qt's core technologies.
 
-The example and demo launcher can be used to explore the different categories
-available. It provides an overview of each example, lets you view the
-documentation in Qt Assistant, and is able to launch examples and demos.
+Documentation for examples can be found via the Examples and Tutorials link
+in the main Qt documentation. The examples and their documentation can also
+be opened from the Examples tab of Qt Creator's Welcome mode.
 
-Documentation for examples can be found in the Tutorial and Examples section
-of the Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index 97f46b3..d0b0db4 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -3778,7 +3778,7 @@ HRESULT QAxServerBase::internalActivate()
 	    }
 
 	    if (m_spInPlaceFrame) {
-		hr = m_spInPlaceFrame->SetActiveObject(this, QStringToBSTR(class_name));
+                hr = m_spInPlaceFrame->SetActiveObject(this, (wchar_t*)class_name.utf16());
 		if (!FAILED(hr)) {
 		    menuBar = (qt.widget && !qax_disable_inplaceframe) ? qt.widget->findChild<QMenuBar*>() : 0;
 		    if (menuBar && !menuBar->isVisible()) {
@@ -3796,7 +3796,7 @@ HRESULT QAxServerBase::internalActivate()
 		}
 	    }
 	    if (spInPlaceUIWindow) {
-		spInPlaceUIWindow->SetActiveObject(this, QStringToBSTR(class_name));
+                spInPlaceUIWindow->SetActiveObject(this, (wchar_t*)class_name.utf16());
 		spInPlaceUIWindow->SetBorderSpace(0);
 	    }
 	}
diff --git a/src/tools/idc/idc.pro b/src/tools/idc/idc.pro
index 05a592a..b9d8dee 100644
--- a/src/tools/idc/idc.pro
+++ b/src/tools/idc/idc.pro
@@ -1,3 +1,5 @@
+option(host_build)
+
 QT = core
 
 SOURCES = main.cpp
diff --git a/tools/tools.pro b/tools/tools.pro
index 1fd647f..5f900a9 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -5,3 +5,7 @@ CONFIG	+= ordered
 SUBDIRS = dumpdoc \
           dumpcpp \
           testcon
+
+qtNomakeTools( \
+    testcon \
+)