Merge branch 'try-fix-qmetafunction'

* try-fix-qmetafunction:
  remove QtDeclarative, which is deprecated
  fix cmake files for tests after the big renaming
  apply Romain's fixes to object_connect.cpp
  applied a simple patch from Romain, this one seems to be of no effect.

6 files changed, 1 insertions, 59 deletions

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index b442457a..e4ecd2b2 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -27,7 +27,7 @@ add_custom_target("docrsts"
             ${pyside2_BINARY_DIR}/pyside_global.h
             --include-paths="${QT_INCLUDE_DIR}${PATH_SEP}${pyside2_SOURCE_DIR}"
             --api-version=${SUPPORTED_QT_VERSION}
-            --typesystem-paths="${pyside2_SOURCE_DIR}${PATH_SEP}${QtCore_SOURCE_DIR}${PATH_SEP}${QtDeclarative_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}${PATH_SEP}${QtHelp_SOURCE_DIR}${PATH_SEP}${QtMultimedia_SOURCE_DIR}${PATH_SEP}${QtNetwork_SOURCE_DIR}${PATH_SEP}${QtOpenGL_SOURCE_DIR}${PATH_SEP}${QtScript_SOURCE_DIR}${PATH_SEP}${QtScriptTools_SOURCE_DIR}${PATH_SEP}${QtSql_SOURCE_DIR}${PATH_SEP}${QtSvg_SOURCE_DIR}${PATH_SEP}${QtTest_SOURCE_DIR}${PATH_SEP}${QtUiTools_SOURCE_DIR}${PATH_SEP}${QtWebKit_SOURCE_DIR}${PATH_SEP}${QtXml_SOURCE_DIR}${PATH_SEP}${QtXmlPatterns_SOURCE_DIR}"
+            --typesystem-paths="${pyside2_SOURCE_DIR}${PATH_SEP}${QtCore_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}${PATH_SEP}${QtHelp_SOURCE_DIR}${PATH_SEP}${QtMultimedia_SOURCE_DIR}${PATH_SEP}${QtNetwork_SOURCE_DIR}${PATH_SEP}${QtOpenGL_SOURCE_DIR}${PATH_SEP}${QtScript_SOURCE_DIR}${PATH_SEP}${QtScriptTools_SOURCE_DIR}${PATH_SEP}${QtSql_SOURCE_DIR}${PATH_SEP}${QtSvg_SOURCE_DIR}${PATH_SEP}${QtTest_SOURCE_DIR}${PATH_SEP}${QtUiTools_SOURCE_DIR}${PATH_SEP}${QtWebKit_SOURCE_DIR}${PATH_SEP}${QtXml_SOURCE_DIR}${PATH_SEP}${QtXmlPatterns_SOURCE_DIR}"
             --library-source-dir=${QT_SRC_DIR}
             --documentation-only
             --documentation-data-dir=${DOC_DATA_DIR}
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
index 78c539bf..8da41768 100644
--- a/doc/_templates/index.html
+++ b/doc/_templates/index.html
@@ -29,8 +29,6 @@
          <span class="linkdescr">core non-GUI functionality</span></p>
       <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtGui/index") }}">QtGui</a><br/>
          <span class="linkdescr">extends QtCore with GUI functionality.</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtDeclarative/index") }}">QtDeclarative</a><br/>
-         <span class="linkdescr">a declarative framework for building highly dynamic, custom user interfaces.</span></p>
       <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtHelp/index") }}">QtHelp</a><br/>
          <span class="linkdescr">provides classes for integrating online documentation in applications</span></p>
       <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtMultimedia/index") }}">QtMultimedia</a><br/>
diff --git a/doc/extras/PySide.QtDeclarative.ListProperty.rst b/doc/extras/PySide.QtDeclarative.ListProperty.rst
deleted file mode 100644
index d32621a4..00000000
--- a/doc/extras/PySide.QtDeclarative.ListProperty.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-.. module:: PySide2.QtDeclarative
-.. _ListProperty:
-
-ListProperty
-************
-
-Synopsis
---------
-
-    The The :class:`~.ListProperty` class allows applications to expose list-like properties to QML.
-
-Detailed Description
---------------------
-
-    The :class:`~.ListProperty` class provides a replacement to QDeclarativeListProperty.
-
-    :class:`~.ListProperty` is a subclass of :class:`QtCore.Property`, that support the following keywords.
-
-    `type`      the type used in the list
-    `append`    Function used to append itens
-    `at`        Function used to retrieve item from the list
-    `clear`     Function used to clear the list
-    `count`     Function used to retrieve the list size
-
-
-    QML has many list properties, where more than one object value can be assigned. The use of a list property from QML looks like this:
-
-    ::
-        FruitBasket {
-             fruit: [
-                 Apple {},
-                 Orange{},
-                 Banana{}
-             ]
-        }
-
-    The :class:`~.ListProperty` encapsulates a group of callbacks that represent the set of actions QML can perform on the list - adding items, retrieving items and clearing the list. In the future, additional operations may be supported. All list properties must implement the append operation, but the rest are optional.
-    To provide a list property, a class must implement the operation callbacks, and then return an appropriate value from the property getter. List properties should have no setter. In the example above, the  ListProperty declarative will look like this:
-
-    ::
-        slices = ListProperty(PieSlice, append=appendSlice)
-
-
-    Note: :class:`~.ListProperty` can only be used for lists of QObject-derived object pointers.
-
-
diff --git a/doc/extras/PySide.QtDeclarative.rst b/doc/extras/PySide.QtDeclarative.rst
deleted file mode 100644
index cb4cc42c..00000000
--- a/doc/extras/PySide.QtDeclarative.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-To include the definitions of the module's classes, use the following directive:
-
-::
-
-    import PySide2.QtDeclarative
diff --git a/doc/modules.rst b/doc/modules.rst
index 611bc855..0faa629a 100644
--- a/doc/modules.rst
+++ b/doc/modules.rst
@@ -7,7 +7,6 @@ Qt is splitted in several modules.
     :maxdepth: 1
 
     PySide/QtCore/index.rst
-    PySide/QtDeclarative/index.rst
     PySide/QtGui/index.rst
     PySide/QtHelp/index.rst
     PySide/QtMultimedia/index.rst
diff --git a/doc/typesystem_doc.xml.in b/doc/typesystem_doc.xml.in
index c1e99ed9..e83706be 100644
--- a/doc/typesystem_doc.xml.in
+++ b/doc/typesystem_doc.xml.in
@@ -48,10 +48,6 @@
     <load-typesystem name="typesystem_multimedia.xml" generate="yes" />
     @end_QtMultimedia@
 
-    @if_QtDeclarative@
-    <load-typesystem name="typesystem_declarative.xml" generate="yes"/>
-    @end_QtDeclarative@
-
     @if_QtOpenGL@
     <load-typesystem name="typesystem_opengl.xml" generate="yes" />
     @end_QtOpenGL@