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

Conflicts:
	mkspecs/features/qt.prf
	src/plugins/platforms/xcb/qxcbwindow.h
	src/tools/qdoc/qdocindexfiles.cpp
	src/widgets/kernel/qwidget_qpa.cpp

Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67

examples/dbus/doc/src/chat.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -28,4 +28,14 @@
 /*!
     \example chat
     \title D-Bus Chat Example
+    \ingroup examples-dbus
+    \brief Demonstrates communication among instances of an application.
+
+    \e Chat is a \l{Qt D-Bus} example which demonstrates a simple chat system
+    among instances of an application. Users connect and send message to
+    each other.
+
+    \image dbus-chat-example.png
+
+    \include examples-run.qdocinc
 */

examples/dbus/doc/src/complexpingpong.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -28,4 +28,16 @@
 /*!
     \example complexpingpong
     \title D-Bus Complex Ping Pong Example
+    \ingroup examples-dbus
+    \brief Demonstrates usage of the Qt D-Bus typesystem.
+
+    \e{Complex Ping Pong Example} demonstrates the use of \l{Qt D-Bus}
+    typesystem with QDBusVariant and QDBusReply. The example consists of the
+    main application \c complexping which starts the other application, \c
+    complexpong. Entering keywords such as \c hello and \c ping is handled by
+    complexpong and the reply is printed to the standard output.
+
+    \include examples-run.qdocinc
+
+    To run, execute the \c complexping application.
 */

examples/dbus/doc/src/listnames.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -28,4 +28,12 @@
 /*!
     \example listnames
     \title D-Bus List Names Example
+    \ingroup examples-dbus
+    \brief Shows how to access the D-Bus bus daemon service.
+
+    \e{List Names} is a command-line example which shows how to
+    access the \l{Qt D-Bus} bus daemon service. The example prints various
+    information about the bus daemon service.
+
+    \include examples-run.qdocinc
 */

examples/dbus/doc/src/pingpong.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -28,4 +28,21 @@
 /*!
     \example pingpong
     \title D-Bus Ping Pong Example
+    \ingroup examples-dbus
+    \brief Demonstrates a simple message system using D-Bus.
+
+    \e{Ping Pong} is a command-line example that demonstrates the basics of
+    \l{Qt D-Bus}. A message is sent to another application and there is a
+    confirmation of the message.
+
+    \include examples-run.qdocinc
+
+    Run the \c pong application and run the \c ping application with the message
+    as the argument.
+
+    \badcode
+    $ ./pong &
+    $ ./ping Hello
+    Reply was: ping("Hello") got called
+    \endcode
 */

examples/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -28,9 +28,13 @@
 /*!
     \example remotecontrolledcar
     \title D-Bus Remote Controlled Car Example
+    \ingroup examples-dbus
+    \brief Shows how to use Qt D-Bus to control a car from another application.
 
-    The Remote Controlled Car example shows how to use D-Bus to control one
-    application using another.
+    The Remote Controlled Car example shows how to use \l{Qt D-Bus} to control
+    one application from another.
 
     \image remotecontrolledcar-car-example.png
+
+    \include examples-run.qdocinc
 */

examples/widgets/mac/mac.pro

@@ -2,6 +2,6 @@ TEMPLATE = subdirs
 
 macx {
     SUBDIRS = \
-        qmacnativewidget \
+        qmaccocoaviewcontainer \
         qmacnativewidget
 }

examples/widgets/mac/qmaccocoaviewcontainer/main.mm

@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
 #include <Cocoa/Cocoa.h>
+#include <QtWidgets>
 #include <QMacCocoaViewContainer>
 
 class WindowWidget : public QWidget

mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in

@@ -1,5 +1,5 @@
 <?xml version=\"1.0\" encoding=\"utf-8\"?>
-<Package xmlns=\"http://schemas.microsoft.com/appx/2010/manifest\" xmlns:v2=\"http://schemas.microsoft.com/appx/2013/manifest\">
+<Package xmlns=\"http://schemas.microsoft.com/appx/2010/manifest\" xmlns:m2=\"http://schemas.microsoft.com/appx/2013/manifest\">
   <Identity
     Name=\"$${WINRT_MANIFEST.identity}\"
     ProcessorArchitecture=\"$${WINRT_MANIFEST.architecture}\"
@@ -22,20 +22,20 @@
       Id=\"App\"
       Executable=\"$${WINRT_MANIFEST.target}.exe\"
       EntryPoint=\"$${WINRT_MANIFEST.target}.App\">
-      <v2:VisualElements
+      <m2:VisualElements
         DisplayName=\"$${WINRT_MANIFEST.name}\"
         Description=\"$${WINRT_MANIFEST.description}\"
         BackgroundColor=\"$${WINRT_MANIFEST.background}\"
         ForegroundText=\"$${WINRT_MANIFEST.foreground}\"
         Square150x150Logo=\"$${WINRT_MANIFEST.logo_large}\"
         Square30x30Logo=\"$${WINRT_MANIFEST.logo_small}\">
-        <v2:DefaultTile>
-          <v2:ShowNameOnTiles>
-            <v2:ShowOn Tile=\"square150x150Logo\" />
-          </v2:ShowNameOnTiles>
-        </v2:DefaultTile>
-        <v2:SplashScreen Image=\"$${WINRT_MANIFEST.logo_splash}\" />
-      </v2:VisualElements>
+        <m2:DefaultTile>
+          <m2:ShowNameOnTiles>
+            <m2:ShowOn Tile=\"square150x150Logo\" />
+          </m2:ShowNameOnTiles>
+        </m2:DefaultTile>
+        <m2:SplashScreen Image=\"$${WINRT_MANIFEST.logo_splash}\" />
+      </m2:VisualElements>
     </Application>
   </Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies}
 </Package>

mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in

@@ -0,0 +1,45 @@
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<Package xmlns=\"http://schemas.microsoft.com/appx/2010/manifest\" xmlns:m3=\"http://schemas.microsoft.com/appx/2014/manifest\" xmlns:mp=\"http://schemas.microsoft.com/appx/2014/phone/manifest\">
+  <Identity
+    Name=\"$${WINRT_MANIFEST.identity}\"
+    ProcessorArchitecture=\"$${WINRT_MANIFEST.architecture}\"
+    Publisher=\"$${WINRT_MANIFEST.publisherid}\"
+    Version=\"$${WINRT_MANIFEST.version}\" />
+  <mp:PhoneIdentity
+    PhoneProductId=\"$${WINRT_MANIFEST.phone_product_id}\"
+    PhonePublisherId=\"$${WINRT_MANIFEST.phone_publisher_id}\" />
+  <Properties>
+    <DisplayName>$${WINRT_MANIFEST.name}</DisplayName>
+    <PublisherDisplayName>$${WINRT_MANIFEST.publisher}</PublisherDisplayName>
+    <Logo>$${WINRT_MANIFEST.logo_store}</Logo>
+  </Properties>
+  <Prerequisites>
+    <OSMinVersion>6.3.1</OSMinVersion>
+    <OSMaxVersionTested>6.3.1</OSMaxVersionTested>
+  </Prerequisites>
+  <Resources>
+    <Resource Language=\"en\" />
+  </Resources>
+  <Applications>
+    <Application
+      Id=\"App\"
+      Executable=\"$${WINRT_MANIFEST.target}.exe\"
+      EntryPoint=\"$${WINRT_MANIFEST.target}.App\">
+      <m3:VisualElements
+        DisplayName=\"$${WINRT_MANIFEST.name}\"
+        Description=\"$${WINRT_MANIFEST.description}\"
+        BackgroundColor=\"$${WINRT_MANIFEST.background}\"
+        ForegroundText=\"$${WINRT_MANIFEST.foreground}\"
+        Square150x150Logo=\"$${WINRT_MANIFEST.logo_large}\"
+        Square44x44Logo=\"$${WINRT_MANIFEST.logo_44x44}\">
+        <m3:DefaultTile Square71x71Logo=\"$${WINRT_MANIFEST.logo_71x71}\">
+          <m3:ShowNameOnTiles>
+            <m3:ShowOn Tile=\"square150x150Logo\" />
+          </m3:ShowNameOnTiles>
+        </m3:DefaultTile>
+        <m3:SplashScreen Image=\"$${WINRT_MANIFEST.logo_480x800}\" />
+      </m3:VisualElements>
+    </Application>
+  </Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies}
+</Package>
+<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->

mkspecs/features/create_cmake.prf

@@ -239,6 +239,10 @@ mac {
         CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
         CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.prl
         CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
+    } else:unversioned_libname {
+        CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.so
+        CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.so
+        CMAKE_LIB_SONAME = lib$${CMAKE_QT_STEM}.so
     } else {
         CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.so.$$eval(QT.$${MODULE}.VERSION)
         CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.so.$$eval(QT.$${MODULE}.VERSION)

mkspecs/features/qml_plugin.prf

@@ -75,18 +75,22 @@ load(qt_common)
         }
 
         load(resolve_target)
-        qml1_target: \
+        qml1_target {
             qmlplugindump = qml1plugindump
-        else: \
+            importpath.name = QML_IMPORT_PATH
+        } else {
             qmlplugindump = qmlplugindump
+            importpath.name = QML2_IMPORT_PATH
+        }
         qtPrepareTool(QMLPLUGINDUMP, $$qmlplugindump)
         importpath.value =
-        for(qmod, QMAKEMODULES) {
-            qmod = $$section(qmod, /, 0, -3)/imports
-            qml1_target: qmod = $$qmod/QtDeclarative
+        for(qmod, QTREPOS) {
+            qml1_target: \
+                qmod = $$qmod/imports
+            else: \
+                qmod = $$qmod/qml
             exists($$qmod): importpath.value += $$shell_path($$qmod)
         }
-        importpath.name = QML_IMPORT_PATH
         importpath.value = $$unique(importpath.value)
         qtAddToolEnv(QMLPLUGINDUMP, importpath)
         TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, )

mkspecs/features/qt.prf

@@ -80,13 +80,16 @@ qt_module_deps = $$resolve_depends(qt_module_deps, "QT.")
 # static builds: link qml import plugins into the app.
 contains(qt_module_deps, qml): \
         contains(QT_CONFIG, static):contains(TEMPLATE, .*app):!host_build:!no_import_scan {
+    !isEmpty(QTREPOS) {
+        for (qrep, QTREPOS): \
+            exists($$qrep/qml): \
+                QMLPATHS += $$qrep/qml
+    } else {
+        QMLPATHS += $$[QT_INSTALL_QML/get]
+    }
+
     # run qmlimportscanner
     qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, _SYS)
-    for (MODULE, QT_MODULES) {
-        PATH = $$eval(QT.$${MODULE}.qml)
-        !isEmpty(PATH):exists($$PATH): QMLPATHS += $$PATH
-    }
-    QMLPATHS = $$unique(QMLPATHS)
     for (QMLPATH, QMLPATHS): \
         IMPORTPATHS += -importPath $$QMLPATH
 

mkspecs/features/qt_build_config.prf

@@ -59,7 +59,6 @@ CONFIG += \
     create_prl link_prl \
     prepare_docs qt_docs_targets \
     no_private_qt_headers_warning QTDIR_build \
-    no_dll \
     # Qt modules get compiled without exceptions enabled by default.
     # However, testcases should be still built with exceptions.
     exceptions_off testcase_exceptions

mkspecs/features/qt_docs.prf

@@ -22,10 +22,27 @@ qtPrepareTool(QDOC, qdoc)
 QDOC += -outputdir $$QMAKE_DOCS_OUTPUTDIR
 !build_online_docs: \
     QDOC += -installdir $$[QT_INSTALL_DOCS]
+PREP_DOC_INDEXES =
 DOC_INDEXES =
-for(qrep, QTREPOS): \
-    exists($$qrep/doc): \
+!isEmpty(QTREPOS) {
+    prepare_docs {
+        # This is not for linking, but for providing type information.
+        mps =
+        deps = $$replace(QT, -private$, )
+        deps = $$resolve_depends(deps, "QT.")
+        for (d, deps): \
+            mps += $$dirname(QT.$${d}.libs)
+        mps = $$unique(mps)
+        for (mp, mps): \
+            PREP_DOC_INDEXES += -indexdir $$mp/doc
+    }
+    for(qrep, QTREPOS): \
         DOC_INDEXES += -indexdir $$qrep/doc
+} else {
+    prepare_docs: \
+        PREP_DOC_INDEXES += -indexdir $$[QT_INSTALL_DOCS/get]
+    DOC_INDEXES += -indexdir $$[QT_INSTALL_DOCS/get]
+}
 qtver.name = QT_VERSION
 qtver.value = $$VERSION
 isEmpty(qtver.value): qtver.value = $$MODULE_VERSION
@@ -39,7 +56,7 @@ qtdocs.value = $$[QT_INSTALL_DOCS/src]
 qtAddToolEnv(QDOC, qtver qtmver qtvertag qtdocs)
 doc_command = $$QDOC $$QMAKE_DOCS
 prepare_docs {
-    prepare_docs.commands += $$doc_command -prepare -no-link-errors
+    prepare_docs.commands += $$doc_command -prepare $$PREP_DOC_INDEXES -no-link-errors
     generate_docs.commands += $$doc_command -generate $$DOC_INDEXES
 } else {
     html_docs.commands += $$doc_command $$DOC_INDEXES