Merge lp:~mikemc/ubuntuone-credentials/add-qmltypes into lp:ubuntuone-credentials

[Mike McCracken]

- add cmake rule to generate qmltypes file for qtcreator integration

- add cmake rule to generate qmltypes file for qtcreator integration

NOTE: the full component directory and the qmltypes file are not generated during build, only during 'make install'.

[lp:~mikemc/ubuntuone-credentials/add-qmltypes]

58. By Mike McCracken on 2013-07-19

Merged ui-validation into add-qmltypes.

59. By Mike McCracken on 2013-07-23

merge with ui-validation, resolve conflict

[dobey (dobey)]

We should probably refactor this later to not do this prior to the install step.

review: Approve

[lp:~mikemc/ubuntuone-credentials/add-qmltypes]

60. By Mike McCracken on 2013-07-23

update README to discuss qmltypes

61. By Mike McCracken on 2013-07-29

Merged ui-validation into add-qmltypes.

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-11 22:38:15 +0000
+++ CMakeLists.txt	2013-07-29 20:40:33 +0000
@@ -28,7 +28,7 @@
 SET (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name.")
 SET (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
 
-set (QML_MODULE_INSTALL_DIR ${LIB_INSTALL_DIR}/qt5/qml/${QML_MODULE_NAME} )
+set (QML_MODULE_INSTALL_DIR ${LIB_INSTALL_DIR}/qt5/qml )
 
 include_directories(${CMAKE_SOURCE_DIR}/libubuntuoneauth
   ${CMAKE_SOURCE_DIR}/libubuntuoneauthui)

=== modified file 'qml-credentials-service/CMakeLists.txt'
--- qml-credentials-service/CMakeLists.txt	2013-07-19 20:22:51 +0000
+++ qml-credentials-service/CMakeLists.txt	2013-07-29 20:40:33 +0000
@@ -16,11 +16,13 @@
   ${AUTH_LIB_NAME}
 )
 
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/qmldir DESTINATION ${QML_MODULE_INSTALL_DIR})
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/qmldir DESTINATION ${QML_MODULE_INSTALL_DIR}/${QML_MODULE_NAME} )
 
 install (TARGETS ${PLUGIN_NAME} 
-  LIBRARY DESTINATION ${QML_MODULE_INSTALL_DIR}
+  LIBRARY DESTINATION ${QML_MODULE_INSTALL_DIR}/${QML_MODULE_NAME}
   NAMELINK_SKIP
 )
 
-install (FILES ${QML_SOURCES} DESTINATION ${QML_MODULE_INSTALL_DIR})
+install (FILES ${QML_SOURCES} DESTINATION ${QML_MODULE_INSTALL_DIR}/${QML_MODULE_NAME} )
+
+install (CODE "execute_process(COMMAND qmlplugindump ${QML_MODULE_NAME} ${PLUGIN_API_VERSION} ${CMAKE_INSTALL_PREFIX}/${QML_MODULE_INSTALL_DIR} OUTPUT_FILE ${CMAKE_INSTALL_PREFIX}/${QML_MODULE_INSTALL_DIR}/${QML_MODULE_NAME}/${QML_MODULE_NAME}.qmltypes)")

=== modified file 'qml-credentials-service/README'
--- qml-credentials-service/README	2013-07-12 16:20:57 +0000
+++ qml-credentials-service/README	2013-07-29 20:40:33 +0000
@@ -10,9 +10,10 @@
 
 An example for embedding the UI provided by the plugin is in examples/embedding.qml
 
-The CMake setup only builds the complete QML component at install, so
-to test without installing to a system location, you will need to do
-something like the following:
+The CMake setup only builds the complete QML component at install, and
+the qmltypes file required by qtcreator is also only built at install,
+so to test without installing to a system location, you will need to
+do something like the following:
 
 mkdir -p build 
 cd build

=== modified file 'qml-credentials-service/qmldir.template'
--- qml-credentials-service/qmldir.template	2013-07-05 17:53:27 +0000
+++ qml-credentials-service/qmldir.template	2013-07-29 20:40:33 +0000
@@ -1,4 +1,4 @@
 module @QML_MODULE_NAME@
 plugin @PLUGIN_NAME@
 CredentialsUI 1.0 CredentialsUI.qml
-typeinfo UbuntuOneCredentials.qmltypes
+typeinfo @QML_MODULE_NAME@.qmltypes