Merge branch 'jb41605' into 'master'

Declare typeinfo in qmldir and more

See merge request mer-core/statefs-qt!5

doc/Doxyfile

@@ -1712,7 +1712,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section
 # have no effect if this option is set to NO (the default)
 
-HAVE_DOT               = YES
+HAVE_DOT               = NO
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
 # allowed to run in parallel. When set to 0 (the default) doxygen will

rpm/statefs-qt5.spec

@@ -1,5 +1,5 @@
-%{!?cmake_install: %global cmake_install make install DESTDIR=%{buildroot}}
-%{!?_libqt5_includedir: %global _libqt5_includedir %{_qt5_headerdir}}
+%{!?cmake_install: %define cmake_install make install DESTDIR=%{buildroot}}
+%{!?_libqt5_includedir: %define _libqt5_includedir %{_qt5_headerdir}}
 
 
 Summary: Statefs Qt bindings
@@ -33,9 +33,6 @@ Requires: %{name} = %{version}-%{release}
 Summary: StateFS Qt5 bindings documentation
 Group: Documenation
 BuildRequires: doxygen
-%if 0%{?_with_docs:1}
-BuildRequires: graphviz
-%endif
 %description doc
 %{summary}
 
@@ -85,7 +82,7 @@ Requires:   %{name} = %{version}-%{release}
 
 %build
 %cmake -DVERSION=%{version} %{?_with_multiarch:-DENABLE_MULTIARCH=ON}
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 make doc
 
 %install

src/qml/CMakeLists.txt

@@ -37,3 +37,8 @@ install(FILES contextkit-qmldir
 install(FILES contextkit-plugins.qmltypes
   DESTINATION ${DST_LIB}/qt5/qml/org/freedesktop/contextkit
   RENAME plugins.qmltypes)
+
+add_custom_target(qmltypes
+  COMMAND qmlplugindump -nonrelocatable Mer.State 1.1 > plugins.qmltypes
+  COMMAND qmlplugindump -nonrelocatable org.freedesktop.contextkit 1.0 > contextkit-plugins.qmltypes
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

src/qml/contextkit-qmldir

@@ -1,2 +1,3 @@
 module org.freedesktop.contextkit
 plugin contextkit
+typeinfo plugins.qmltypes

src/qml/qmldir

@@ -1,2 +1,3 @@
 module Mer.State
 plugin statefs-declarative
+typeinfo plugins.qmltypes