Merge lp:~ahayzen/ubuntu-printing-app/rearrange-folders into lp:ubuntu-printing-app

[Andrew Hayzen]

* Move printing app tests into the ubuntu-printing-app folder
* Move backend to ubuntu-printing-app/backend
* Move runner to ubuntu-printing-app/runner
* Remove any trace of click
* Update cmake to respect changes

* Move printing app tests into the ubuntu-printing-app folder
* Move backend to ubuntu-printing-app/backend
* Move runner to ubuntu-printing-app/runner
* Remove any trace of click
* Update cmake to respect changes

[Michael Sheldon (michael-sheldon)]

Looks good

review: Approve

[Tanna dietrich (tannaldietrich)]

This is a good post on the app. I have found more info about the app which is applicable for my [url=https://printerssupport.org/ricoh-printer-support/]Ricoh printer[/url]

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-03-20 16:30:48 +0000
+++ CMakeLists.txt	2017-03-20 16:30:48 +0000
@@ -5,26 +5,11 @@
 enable_testing()
 
 # Load translation tools
-find_program(INTLTOOL_MERGE intltool-merge)
-if(NOT INTLTOOL_MERGE)
-    message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
-endif()
-
-find_program(INTLTOOL_EXTRACT intltool-extract)
-if(NOT INTLTOOL_EXTRACT)
-    message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
-endif()
+find_package(Intltool REQUIRED)
 
 # Set the vars
-set(APP_NAME ubuntu-printing-app)
-set(APP_HARDCODE ubuntu-printing-app)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")  # -fno-permissive -pedantic -Wall -Wextra")
-set(DESKTOP_FILE "${APP_NAME}.desktop")
-set(ICON_FILE ubuntu-printing-app.svg)
-set(MAIN_QML Main.qml)
-set(RUNNER ${APP_HARDCODE})
-set(SNAP_DESKTOP_FILE setup/gui/${DESKTOP_FILE})
 
 # Set the options
 option(SNAP_MODE "Build as a snap package" off)
@@ -37,44 +22,14 @@
 
 include(GNUInstallDirs)
 
-
-# Set the path for the QML files and the backend
-set(UBUNTU_PRINTING_APP_DATA_DIR "${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE}")
-set(MODULE_PATH ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/${APP_HARDCODE})
-
-# Set the exec path
-if(SNAP_MODE)
-  set(EXEC "APP_ID=${APP_HARDCODE} qmlscene $@ -I $SNAP/${MODULE_PATH} $SNAP/${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${MAIN_QML}")
-  set(ICON "$SNAP/${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${ICON_FILE}")
-else(SNAP_MODE)
-  set(EXEC "APP_ID=${APP_HARDCODE} qmlscene $@ -I ${MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${MAIN_QML}")
-  set(ICON ${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${ICON_FILE})
-endif(SNAP_MODE)
-
-
 # Add subdirs
-add_subdirectory(backend)
 add_subdirectory(notifier)
-add_subdirectory(runner)
 add_subdirectory(ubuntu-printing-app)
 
 # Setup gettext defs and include po directory
 set(GETTEXT_PACKAGE "ubuntu-printing-app")
-add_definitions(-DI18N_DOMAIN="${GETTEXT_PACKAGE}")
-
 add_subdirectory(po)
 
-# Add tests
-find_package(Qt5Test REQUIRED)
-enable_testing()
-add_subdirectory(tests)
-
-
-# Add run command for QtC
-add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/ubuntu-printing-app/Main.qml
-                  DEPENDS UbuntuPrintingApp UbuntuPrintingAppqmldir
-                  WORKING_DIRECTORY ./ubuntu-printing-app)
-
 # Show files in QtC
 file(GLOB QTC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}

=== modified file 'debian/control'
--- debian/control	2017-03-20 16:30:48 +0000
+++ debian/control	2017-03-20 16:30:48 +0000
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Andrew Hayzen <[e-mail]>
 Build-Depends: cmake (>= 2.8.9),
+               cmake-extras (>= 0.10),
                cmake-extras (>= 1.3),
                debhelper (>=9),
                dh-apparmor,

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2017-01-24 10:58:19 +0000
+++ po/CMakeLists.txt	2017-03-20 16:30:48 +0000
@@ -1,44 +1,12 @@
-project(ubuntu-printing-app-translations)
-
-include(FindGettext)
-find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
-
-file(RELATIVE_PATH DESKTOP_FILE_IN_IN ${CMAKE_SOURCE_DIR}
-     ${CMAKE_SOURCE_DIR}/ubuntu-printing-app/${DESKTOP_FILE}.in.in)
-file(RELATIVE_PATH DESKTOP_FILE_IN_IN_H ${CMAKE_SOURCE_DIR}
-     ${CMAKE_CURRENT_SOURCE_DIR}/${DESKTOP_FILE_IN_IN}.h)
-
-file(GLOB_RECURSE I18N_SRC_FILES
-     RELATIVE ${CMAKE_SOURCE_DIR}
-     ${CMAKE_SOURCE_DIR}/ubuntu-printing-app/**.qml)
-list(SORT I18N_SRC_FILES)
-
-set(DOMAIN ${GETTEXT_PACKAGE})
-set(POT_FILE ${DOMAIN}.pot)
-file(GLOB PO_FILES *.po)
-
-add_custom_target(${POT_FILE} ALL
-                  COMMENT "Generating translation template"
-                  COMMAND touch ${POT_FILE}
-                  COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
-                          --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE_IN_IN}
-                  COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
-                          -D ${CMAKE_SOURCE_DIR}
-                          --from-code=UTF-8
-                          --c++ --qt --add-comments=TRANSLATORS
-                          --keyword=tr --keyword=tr:1,2 --keyword=N_
-                          -j
-                          --package-name=ubuntu-printing-app
-                          --copyright-holder='Canonical Ltd.'
-                          -D ${CMAKE_SOURCE_DIR} ${I18N_SRC_FILES}
-                          -D ${CMAKE_BINARY_DIR} ${DESKTOP_FILE_IN_IN_H}
-                  COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR})
-
-foreach(PO_FILE ${PO_FILES})
-    get_filename_component(LANG ${PO_FILE} NAME_WE)
-    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
-    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
-            DESTINATION ${INSTALL_DIR}
-            RENAME ${DOMAIN}.mo)
-endforeach(PO_FILE)
+intltool_update_potfile(
+    KEYWORDS "_" "_:1,2" "N_" "N_:1,2" "tr" "tr:1,2"
+    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+    COPYRIGHT_HOLDER "Canonical Ltd."
+    FILE_GLOBS "${CMAKE_SOURCE_DIR}/*.desktop.in.in" "${CMAKE_SOURCE_DIR}/*.qml"
+    FILTER "tests/*"
+)
+
+intltool_install_translations(
+    ALL
+    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+)

=== modified file 'po/ubuntu-printing-app.pot'
--- po/ubuntu-printing-app.pot	2017-02-28 15:34:29 +0000
+++ po/ubuntu-printing-app.pot	2017-03-20 16:30:48 +0000
@@ -1,129 +1,198 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the ubuntu-printing-app package.
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ubuntu-printing-app\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-28 15:29+0000\n"
+"POT-Creation-Date: 2017-03-20 16:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: ubuntu-printing-app/Main.qml:66
-msgid "Document is invalid"
-msgstr ""
-
-#: ubuntu-printing-app/Main.qml:69
-msgid "Document not found"
-msgstr ""
-
-#: ubuntu-printing-app/Main.qml:72
-msgid "Not a PDF document"
-msgstr ""
-
-#: ubuntu-printing-app/Main.qml:75
-msgid "An unknown error occurred"
-msgstr ""
-
-#: ubuntu-printing-app/Main.qml:99
-msgid "Error"
-msgstr ""
-
-#: ubuntu-printing-app/Main.qml:126
-msgid "URL of PDF to print"
-msgstr ""
-
-#: ubuntu-printing-app/components/AlertDialog.qml:28
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: ../notifier/src/notify-engine.cpp:48
+#, c-format
+msgid "A cover is open on the printer “%s”."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:49
+#, c-format
+msgid "The printer “%s” can’t be used, because required software is missing."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:50
+#, c-format
+msgid "A door is open on the printer “%s”."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:51
+#, c-format
+msgid "The printer “%s” is out of paper."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:52
+#, c-format
+msgid "The printer “%s” is low on paper."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:53
+#, c-format
+msgid "The printer “%s” is currently off-line."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:54
+#, c-format
+msgid "The printer “%s” has an unknown problem."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:55
+#, c-format
+msgid "The printer “%s” is out of toner."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:56
+#, c-format
+msgid "The printer “%s” is low on toner."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:167
+#, c-format
+msgid "“%s” has printed."
+msgstr ""
+
+#: ../notifier/src/notify-engine.cpp:185
+#, c-format
+msgid "You have %d job queued to print on this printer."
+msgid_plural "You have %d jobs queued to print on this printer."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../notifier/src/notify-engine.cpp:193
+#: ../ubuntu-printing-app/components/AlertDialog.qml:28
 msgid "OK"
 msgstr ""
 
-#: ubuntu-printing-app/components/PrintRow.qml:57
-msgid "Cancel"
-msgstr ""
-
-#: ubuntu-printing-app/components/PrintRow.qml:71
-msgid "Create PDF"
-msgstr ""
-
-#: ubuntu-printing-app/components/PrintRow.qml:71
-#: po/ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:1
+#: ../notifier/src/notify-engine.cpp:195
+msgid "Settings…"
+msgstr ""
+
+#. notifier
+#. printing
+#. ubuntu
+#: ../build/po/ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:1
+#: ../ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:1
+#: ../ubuntu-printing-app/components/PrintRow.qml:74
 msgid "Print"
 msgstr ""
 
-#: ubuntu-printing-app/components/PrintRow.qml:71
-msgid "Sheets"
-msgstr ""
-
-#: ubuntu-printing-app/pages/ContentPeerPickerPage.qml:43
-msgid "Open With..."
-msgstr ""
-
-#: ubuntu-printing-app/pages/EmptyPage.qml:48
+#: ../build/po/ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:2
+#: ../ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:2
+msgid "Print;Printing;"
+msgstr ""
+
+#: ../ubuntu-printing-app/pages/EmptyPage.qml:48
 msgid ""
 "No document was chosen for printing. In order to print, you need to select "
 "print from an app. Alternatively you can export a PDF document from an app."
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:47
+#: ../ubuntu-printing-app/pages/PrintPage.qml:47
 msgid "Page Setup"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:47
+#: ../ubuntu-printing-app/pages/PrintPage.qml:47
 msgid "Printer Options"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:85
+#: ../ubuntu-printing-app/pages/PrintPage.qml:86
 msgid "Printer"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:106
+#: ../ubuntu-printing-app/pages/PrintPage.qml:107
 msgid "Copies"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:129
-msgid "Collate"
-msgstr ""
-
-#: ubuntu-printing-app/pages/PrintPage.qml:149
-msgid "Reverse"
-msgstr ""
-
-#: ubuntu-printing-app/pages/PrintPage.qml:170
+#: ../ubuntu-printing-app/pages/PrintPage.qml:131
 msgid "All"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:170
+#: ../ubuntu-printing-app/pages/PrintPage.qml:131
 msgid "Range"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:174
+#: ../ubuntu-printing-app/pages/PrintPage.qml:135
 msgid "Pages"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:216
+#: ../ubuntu-printing-app/pages/PrintPage.qml:177
 msgid "eg 1-3,8"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:225
+#: ../ubuntu-printing-app/pages/PrintPage.qml:186
 msgid "Two-sided"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:246
+#: ../ubuntu-printing-app/pages/PrintPage.qml:207
 msgid "Color"
 msgstr ""
 
-#: ubuntu-printing-app/pages/PrintPage.qml:267
+#: ../ubuntu-printing-app/pages/PrintPage.qml:228
 msgid "Quality"
 msgstr ""
 
-#: po/ubuntu-printing-app/ubuntu-printing-app.desktop.in.in.h:2
-msgid "Print;Printing;"
+#: ../ubuntu-printing-app/pages/PrintPage.qml:246
+msgid "Collate"
+msgstr ""
+
+#: ../ubuntu-printing-app/pages/PrintPage.qml:266
+msgid "Reverse"
+msgstr ""
+
+#: ../ubuntu-printing-app/pages/ContentPeerPickerPage.qml:43
+msgid "Open With..."
+msgstr ""
+
+#: ../ubuntu-printing-app/Main.qml:66
+msgid "Document is invalid"
+msgstr ""
+
+#: ../ubuntu-printing-app/Main.qml:69
+msgid "Document not found"
+msgstr ""
+
+#: ../ubuntu-printing-app/Main.qml:72
+msgid "Not a PDF document"
+msgstr ""
+
+#: ../ubuntu-printing-app/Main.qml:75
+msgid "An unknown error occurred"
+msgstr ""
+
+#: ../ubuntu-printing-app/Main.qml:99
+msgid "Error"
+msgstr ""
+
+#: ../ubuntu-printing-app/Main.qml:126
+msgid "URL of PDF to print"
+msgstr ""
+
+#. Text color is determined from background color so set from html
+#: ../ubuntu-printing-app/components/PrintRow.qml:60
+msgid "Cancel"
+msgstr ""
+
+#: ../ubuntu-printing-app/components/PrintRow.qml:74
+msgid "Create PDF"
+msgstr ""
+
+#: ../ubuntu-printing-app/components/PrintRow.qml:74
+msgid "Sheets"
 msgstr ""

=== removed directory 'setup'
=== renamed directory 'setup/gui' => 'snap/gui'
=== renamed file 'snapcraft.yaml' => 'snap/snapcraft.yaml'
=== modified file 'ubuntu-printing-app/CMakeLists.txt'
--- ubuntu-printing-app/CMakeLists.txt	2017-01-20 12:36:56 +0000
+++ ubuntu-printing-app/CMakeLists.txt	2017-03-20 16:30:48 +0000
@@ -1,6 +1,34 @@
+set(APP_NAME ubuntu-printing-app)
+set(APP_HARDCODE ubuntu-printing-app)
+set(DESKTOP_FILE "${APP_NAME}.desktop")
+set(ICON_FILE ubuntu-printing-app.svg)
+set(MAIN_QML Main.qml)
+set(RUNNER ${APP_HARDCODE})
+set(SNAP_DESKTOP_FILE snap/gui/${DESKTOP_FILE})
+
+# Set the path for the QML files and the backend
+set(UBUNTU_PRINTING_APP_DATA_DIR "${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE}")
+set(MODULE_PATH ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/${APP_HARDCODE})
+
+# Set the exec path
+if(SNAP_MODE)
+  set(EXEC "APP_ID=${APP_HARDCODE} qmlscene $@ -I $SNAP/${MODULE_PATH} $SNAP/${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${MAIN_QML}")
+  set(ICON "$SNAP/${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${ICON_FILE}")
+else(SNAP_MODE)
+  set(EXEC "APP_ID=${APP_HARDCODE} qmlscene $@ -I ${MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${MAIN_QML}")
+  set(ICON ${CMAKE_INSTALL_PREFIX}/${UBUNTU_PRINTING_APP_DATA_DIR}/${ICON_FILE})
+endif(SNAP_MODE)
+
+add_subdirectory(backend)
 add_subdirectory(components)
+add_subdirectory(runner)
 add_subdirectory(pages)
 
+# Add tests
+find_package(Qt5Test REQUIRED)
+enable_testing()
+add_subdirectory(tests)
+
 # Install Main.qml and icon
 install(FILES ${MAIN_QML} DESTINATION ${UBUNTU_PRINTING_APP_DATA_DIR})
 install(FILES ${ICON_FILE} DESTINATION ${UBUNTU_PRINTING_APP_DATA_DIR})
@@ -12,10 +40,11 @@
 
 # Install desktop file
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${DESKTOP_FILE}.in.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in)
-
-add_custom_target(${DESKTOP_FILE} ALL
-  COMMENT "Merging translations into ${DESKTOP_FILE}"
-  COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
+intltool_merge_translations(
+  "${DESKTOP_FILE}.in"
+  "${DESKTOP_FILE}"
+  ALL
+  UTF8
 )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
@@ -27,3 +56,6 @@
   file(GLOB MAIN_QML_JS_FILES *.apparmor *.js *.json *.qml)
   add_custom_target(ubuntu_printing_app_main_qml_js_files ALL SOURCES ${MAIN_QML_JS_FILES})
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+
+# Set variables for use in parent scope
+set(UBUNTU_PRINTING_APP_DESKTOP_FILE "${DESKTOP_FILE}" PARENT_SCOPE)

=== renamed directory 'backend' => 'ubuntu-printing-app/backend'
=== renamed directory 'runner' => 'ubuntu-printing-app/runner'
=== renamed directory 'tests' => 'ubuntu-printing-app/tests'
=== modified file 'ubuntu-printing-app/tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2017-03-07 14:53:12 +0000
+++ ubuntu-printing-app/tests/qmltests/CMakeLists.txt	2017-03-20 16:30:48 +0000
@@ -18,7 +18,7 @@
 set(TEST tst_QmlTests)
 add_test(${TEST} ${XVFB_COMMAND} ${QMLTESTRUNNER} -qt=qt5
          -input ${CMAKE_CURRENT_SOURCE_DIR}
-         -import ${CMAKE_BINARY_DIR}/backend)
+         -import ${CMAKE_BINARY_DIR}/ubuntu-printing-app/backend)
 
 
 # Add the qml test files to build dir

=== modified file 'ubuntu-printing-app/tests/qmltests/tst_CheckBoxRow.qml'
--- tests/qmltests/tst_CheckBoxRow.qml	2017-01-25 18:13:57 +0000
+++ ubuntu-printing-app/tests/qmltests/tst_CheckBoxRow.qml	2017-03-20 16:30:48 +0000
@@ -20,7 +20,7 @@
 import QtQuick 2.4
 import QtTest 1.1
 import Ubuntu.Test 1.0
-import "../../ubuntu-printing-app/components"
+import "../../components"
 
 Item {
     width: units.gu(100)

=== modified file 'ubuntu-printing-app/tests/qmltests/tst_LabelRow.qml'
--- tests/qmltests/tst_LabelRow.qml	2017-01-25 12:45:05 +0000
+++ ubuntu-printing-app/tests/qmltests/tst_LabelRow.qml	2017-03-20 16:30:48 +0000
@@ -20,7 +20,7 @@
 import QtQuick 2.4
 import QtTest 1.1
 import Ubuntu.Test 1.0
-import "../../ubuntu-printing-app/components"
+import "../../components"
 
 Item {
     width: units.gu(100)

=== modified file 'ubuntu-printing-app/tests/qmltests/tst_PreviewRow.qml'
--- tests/qmltests/tst_PreviewRow.qml	2017-03-08 12:59:51 +0000
+++ ubuntu-printing-app/tests/qmltests/tst_PreviewRow.qml	2017-03-20 16:30:48 +0000
@@ -20,7 +20,7 @@
 import QtQuick 2.4
 import QtTest 1.1
 import Ubuntu.Test 1.0
-import "../../ubuntu-printing-app/components"
+import "../../components"
 
 import UbuntuPrintingApp 1.0
 import Ubuntu.Components.Extras.Printers 0.1

=== modified file 'ubuntu-printing-app/tests/qmltests/tst_PrintPage.qml'
--- tests/qmltests/tst_PrintPage.qml	2017-03-08 12:59:51 +0000
+++ ubuntu-printing-app/tests/qmltests/tst_PrintPage.qml	2017-03-20 16:30:48 +0000
@@ -20,7 +20,7 @@
 import QtQuick 2.4
 import QtTest 1.1
 import Ubuntu.Test 1.0
-import "../../ubuntu-printing-app/pages"
+import "../../pages"
 
 import UbuntuPrintingApp 1.0
 import Ubuntu.Components.Extras.Printers 0.1

=== modified file 'ubuntu-printing-app/tests/qmltests/tst_PrintRow.qml'
--- tests/qmltests/tst_PrintRow.qml	2017-02-17 17:48:28 +0000
+++ ubuntu-printing-app/tests/qmltests/tst_PrintRow.qml	2017-03-20 16:30:48 +0000
@@ -20,7 +20,7 @@
 import QtQuick 2.4
 import QtTest 1.1
 import Ubuntu.Test 1.0
-import "../../ubuntu-printing-app/components"
+import "../../components"
 
 Item {
     width: units.gu(100)

=== modified file 'ubuntu-printing-app/tests/qmltests/tst_SelectorRow.qml'
--- tests/qmltests/tst_SelectorRow.qml	2017-03-07 13:46:02 +0000
+++ ubuntu-printing-app/tests/qmltests/tst_SelectorRow.qml	2017-03-20 16:30:48 +0000
@@ -20,7 +20,7 @@
 import QtQuick 2.4
 import QtTest 1.1
 import Ubuntu.Test 1.0
-import "../../ubuntu-printing-app/components"
+import "../../components"
 
 Item {
     width: units.gu(100)

=== modified file 'ubuntu-printing-app/tests/qmltests/tst_TextFieldRow.qml'
--- tests/qmltests/tst_TextFieldRow.qml	2017-01-25 12:45:05 +0000
+++ ubuntu-printing-app/tests/qmltests/tst_TextFieldRow.qml	2017-03-20 16:30:48 +0000
@@ -20,7 +20,7 @@
 import QtQuick 2.4
 import QtTest 1.1
 import Ubuntu.Test 1.0
-import "../../ubuntu-printing-app/components"
+import "../../components"
 
 Item {
     width: units.gu(100)

=== modified file 'ubuntu-printing-app/tests/unittests/backend/CMakeLists.txt'
--- tests/unittests/backend/CMakeLists.txt	2017-01-27 17:17:01 +0000
+++ ubuntu-printing-app/tests/unittests/backend/CMakeLists.txt	2017-03-20 16:30:48 +0000
@@ -1,7 +1,7 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/backend/
+    ${CMAKE_SOURCE_DIR}/ubuntu-printing-app/backend/
 )
 
 find_package(Qt5Test REQUIRED)