Merge lp:~dpm/ubuntu-filemanager-app/show-ap into lp:ubuntu-filemanager-app

[David Planella]

Show autopilot files in Qt Creator

Show autopilot files in Qt Creator

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:316
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/371/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1356
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1356/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/169

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/371/rebuild

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

Works great, thank you!

review: Approve

=== modified file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	2014-05-01 18:35:42 +0000
+++ tests/autopilot/CMakeLists.txt	2014-10-28 19:24:24 +0000
@@ -6,3 +6,5 @@
     DESTINATION ${PYTHON_PACKAGE_DIR}
     )
 endif(INSTALL_TESTS)
+
+add_subdirectory(filemanager)
 
=== added file 'tests/autopilot/filemanager/CMakeLists.txt'
--- tests/autopilot/filemanager/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/autopilot/filemanager/CMakeLists.txt	2014-10-28 19:24:24 +0000
@@ -0,0 +1,8 @@
+# make the emulator files visible on qtcreator
+file(GLOB PYTHON_EMULATOR_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     *.py)
+
+add_custom_target(com_ubuntu_filemanager_PYTHONEMULATORFiles ALL SOURCES ${PYTHON_EMULATOR_FILES})
+
+add_subdirectory(tests)
 
=== added file 'tests/autopilot/filemanager/tests/CMakeLists.txt'
--- tests/autopilot/filemanager/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/autopilot/filemanager/tests/CMakeLists.txt	2014-10-28 19:24:24 +0000
@@ -0,0 +1,6 @@
+# make the test files visible on qtcreator
+file(GLOB PYTHON_TEST_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     *.py)
+
+add_custom_target(com_ubuntu_filemanager_PYTHONTESTFiles ALL SOURCES ${PYTHON_TEST_FILES})