Merge lp:~achiang/telegram-app/libqtelegram-click-prep-1 into lp:~libqtelegram-team/telegram-app/qml-plugin

[Alex Chiang]

Some small changes to help make it easier to click package the app.

[Michał Karnicki (karni)]

review: Approve

=== modified file 'lib/CMakeLists.txt'
--- lib/CMakeLists.txt	2014-07-08 17:43:44 +0000
+++ lib/CMakeLists.txt	2014-07-30 23:43:46 +0000
@@ -37,8 +37,10 @@
 set(HEADERS
     telegram.h
     libqtelegram_global.h)
+if(NOT CLICK_MODE)
 INSTALL(FILES ${HEADERS}
     DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libqtelegram)
+endif(NOT CLICK_MODE)
     
 set(PREFIX "${CMAKE_INSTALL_PREFIX}")
 set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
@@ -48,8 +50,10 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/qtelegram.pc.in
     ${CMAKE_CURRENT_BINARY_DIR}/qtelegram.pc
     @ONLY)
+if(NOT CLICK_MODE)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/qtelegram.pc
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+endif(NOT CLICK_MODE)
 
 add_subdirectory(types)
 add_subdirectory(core)

=== modified file 'lib/core/CMakeLists.txt'
--- lib/core/CMakeLists.txt	2014-07-08 04:13:10 +0000
+++ lib/core/CMakeLists.txt	2014-07-30 23:43:46 +0000
@@ -19,6 +19,8 @@
     endpoint.h
     sessionmanager.h)
 
+if(NOT CLICK_MODE)
 INSTALL(FILES ${CORE_HEADERS}
     DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libqtelegram/core)
+endif(NOT CLICK_MODE)
     

=== modified file 'lib/logic/CMakeLists.txt'
--- lib/logic/CMakeLists.txt	2014-07-08 04:13:10 +0000
+++ lib/logic/CMakeLists.txt	2014-07-30 23:43:46 +0000
@@ -4,6 +4,7 @@
     uploadfile.h
     file.h)
 
+if(NOT CLICK_MODE)
 INSTALL(FILES ${LOGIC_HEADERS}
     DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libqtelegram/logic)
-    
+endif(NOT CLICK_MODE)    

=== modified file 'lib/types/CMakeLists.txt'
--- lib/types/CMakeLists.txt	2014-07-08 17:43:44 +0000
+++ lib/types/CMakeLists.txt	2014-07-30 23:43:46 +0000
@@ -61,5 +61,7 @@
     chatlocated.h
     types.h)
 
+if(NOT CLICK_MODE)
 INSTALL(FILES ${TYPES_HEADERS} 
     DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libqtelegram/types)
+endif(NOT CLICK_MODE)

=== modified file 'qmlplugin/CMakeLists.txt'
--- qmlplugin/CMakeLists.txt	2014-07-30 16:09:13 +0000
+++ qmlplugin/CMakeLists.txt	2014-07-30 23:43:46 +0000
@@ -14,9 +14,10 @@
 endif (NOT QT_IMPORTS_DIR)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${libqtelegram_SOURCE_DIR}/lib)
 
 set(QMLPLUGIN_NAME Telegram)
-set(MODULE_NAME "Ubuntu.Plugins.Telegram")
+set(MODULE_NAME "Telegram")
 
 
 set(QMLPLUGIN_SRCS

=== modified file 'qmlplugin/qmldir'
--- qmlplugin/qmldir	2014-07-15 17:31:52 +0000
+++ qmlplugin/qmldir	2014-07-30 23:43:46 +0000
@@ -1,2 +1,2 @@
-module Ubuntu.Plugins.Telegram
-plugin Telegram
\ No newline at end of file
+module Telegram
+plugin Telegram

=== modified file 'qmlplugin/telegramplugin.h'
--- qmlplugin/telegramplugin.h	2014-06-20 09:52:32 +0000
+++ qmlplugin/telegramplugin.h	2014-07-30 23:43:46 +0000
@@ -7,7 +7,7 @@
 /*
  ----8<-----
 
- import Ubuntu.Plugins.Telegram 0.1
+ import Telegram 0.1
 
  Rectangle {
    width: 200

=== modified file 'uitest/ui/ContactsPage.qml'
--- uitest/ui/ContactsPage.qml	2014-07-25 09:40:58 +0000
+++ uitest/ui/ContactsPage.qml	2014-07-30 23:43:46 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
-import Ubuntu.Plugins.Telegram 0.1
+import Telegram 0.1
 
 Page {
 

=== modified file 'uitest/ui/DialogPage.qml'
--- uitest/ui/DialogPage.qml	2014-07-07 13:44:35 +0000
+++ uitest/ui/DialogPage.qml	2014-07-30 23:43:46 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import Ubuntu.Plugins.Telegram 0.1
+import Telegram 0.1
 
 DialogDesignPage {
 
@@ -7,7 +7,7 @@
         var message = sendMsgTextField.text;
         if (message.length > 0) {
             //Another option is creating the input object by using:
-            //var inputPeer = Qt.createQmlObject('import Ubuntu.Plugins.Telegram 0.1; TLInputPeer{}', dialogPage, null);
+            //var inputPeer = Qt.createQmlObject('import Telegram 0.1; TLInputPeer{}', dialogPage, null);
 
             if (peerIsChat) {
                 inputPeer.classType = TLInputPeer.TypeInputPeerChat;

=== modified file 'uitest/ui/DialogsPageDesign.qml'
--- uitest/ui/DialogsPageDesign.qml	2014-07-21 17:12:18 +0000
+++ uitest/ui/DialogsPageDesign.qml	2014-07-30 23:43:46 +0000
@@ -2,7 +2,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import "../components/listitems"
-import Ubuntu.Plugins.Telegram 0.1
+import Telegram 0.1
 
 Page {
 

=== modified file 'uitest/uitest.qml'
--- uitest/uitest.qml	2014-07-24 08:45:05 +0000
+++ uitest/uitest.qml	2014-07-30 23:43:46 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Plugins.Telegram 0.1
+import Telegram 0.1
 import "ui"
 
 /*!