ubuntu-touch-coreapps-reviewers team mailing list archive

[Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>]

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-desktop-install-fix into lp:ubuntu-calculator-app.

Commit message:
Fix installation on Ubuntu Desktop

Requested reviews:
  David Planella (dpm)

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-calculator-app/ubuntu-calculator-app-desktop-install-fix/+merge/262799

Fix installation on Ubuntu Desktop
-- 
Your team Ubuntu Calculator Developers is subscribed to branch lp:ubuntu-calculator-app.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-14 16:42:56 +0000
+++ CMakeLists.txt	2015-06-23 22:43:34 +0000
@@ -31,9 +31,8 @@
 set(APP_HARDCODE                    ubuntu-calculator-app)
 set(AUTOPILOT_DIR                   ubuntu_calculator_app)
 set(MAIN_QML                        ${APP_HARDCODE}.qml)
-set(ICON                            "${APP_HARDCODE}.png")
+set(ICON_FILE                       "${APP_HARDCODE}.png")
 set(DESKTOP_FILE                    "${APP_HARDCODE}.desktop")
-set(AUTOPILOT_DIR                   ubuntu_calculator_app)
 set(APP_VERSION                     2.0)
 
 if(CLICK_MODE)
@@ -41,8 +40,7 @@
   set(UBUNTU-CALCULATOR-APP_DIR    "${CMAKE_INSTALL_DATADIR}/qml")
 
   set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
-  set(EXEC "qmlscene $@ ${UBUNTU-CALCULATOR-APP_DIR}/${MAIN_QML}")
-  set(MODULE_PATH ${QT_IMPORTS_DIR})
+  set(EXEC "qmlscene -qt5 $@ ${UBUNTU-CALCULATOR-APP_DIR}/${MAIN_QML}")
   if(NOT BZR_REVNO)
     execute_process(
       COMMAND bzr revno
@@ -76,8 +74,10 @@
   configure_file(${UBUNTU_MANIFEST_PATH} ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
   install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})
+  set(ICON ${ICON_FILE})
 else(CLICK_MODE)
-  set(EXEC "qmlscene $@ -I ${MODULE_PATH}  ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR}/${MAIN_QML}")
+  set(ICON ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR}/${ICON_FILE})
+  set(EXEC "qmlscene -qt5 $@ ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR}/${MAIN_QML}")
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2015-04-14 16:42:56 +0000
+++ app/CMakeLists.txt	2015-06-23 22:43:34 +0000
@@ -3,12 +3,8 @@
   add_custom_target(ubuntu-calculator-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
-if(CLICK_MODE)
-  set(ICON ${ICON})
-  install(FILES graphics/${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
-endif(CLICK_MODE)
-
-install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR})
+install(FILES graphics/${ICON_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
+install(FILES ${MAIN_QML} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
 
 add_subdirectory(engine)
 add_subdirectory(graphics)

=== modified file 'app/graphics/CMakeLists.txt'
--- app/graphics/CMakeLists.txt	2015-03-11 09:13:18 +0000
+++ app/graphics/CMakeLists.txt	2015-06-23 22:43:34 +0000
@@ -1,4 +1,7 @@
-file(GLOB GRAPHICS_FILES *.svg)
+set(GRAPHICS_FILES 
+  select_none.svg  
+  select.svg
+)
 
 install(FILES ${GRAPHICS_FILES} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR}/graphics)
 

=== removed file 'app/graphics/toolbarIcon@xxxxx'
Binary files app/graphics/toolbarIcon@xxxxx	2014-11-10 09:28:27 +0000 and app/graphics/toolbarIcon@xxxxx	1970-01-01 00:00:00 +0000 differ