Merge lp:~mzanetti/reminders-app/switch-to-cmake into lp:reminders-app

[Michael Zanetti]

switch from qmake to cmake

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

FAILED: Continuous integration, rev:40
http://91.189.93.70:8080/job/reminders-app-ci/52/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/515/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/52/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/52/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/52/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/switch-to-cmake]

41. By Michael Zanetti on 2013-12-18

merge trunk

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

FAILED: Continuous integration, rev:41
http://91.189.93.70:8080/job/reminders-app-ci/54/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/517/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/54/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/54/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/54/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/switch-to-cmake]

42. By Michael Zanetti on 2013-12-18

install plugin files as expected by .install file

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

PASSED: Continuous integration, rev:42
http://91.189.93.70:8080/job/reminders-app-ci/55/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/518
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/55
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/55

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/55/rebuild

review: Approve (continuous-integration)

[lp:~mzanetti/reminders-app/switch-to-cmake]

43. By Michael Zanetti on 2013-12-19

merge prerequisite branch

44. By Michael Zanetti on 2013-12-19

use absolute include path

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

PASSED: Continuous integration, rev:43
http://91.189.93.70:8080/job/reminders-app-ci/56/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/519
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/56
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/56

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/56/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:44
http://91.189.93.70:8080/job/reminders-app-ci/57/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/520
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/57
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/57

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/57/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

This fails to deploy/build for me because cmake isn't pre-installed by "run_on_ubuntu_touch.sh -s" I guess?

alan@deep-thought:/tmp/switch-to-cmake$ ./run_on_ubuntu_touch.sh -s
adbd is already running as root
ssh start/running, process 3020
Transferring code..
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
sending incremental file list

sent 11638 bytes received 77 bytes 23430.00 bytes/sec
total size is 3231629 speedup is 275.85
Setting up environment for building reminders-app...
/home/alan/.ssh/known_hosts updated.
Original contents retained as /home/alan/.ssh/known_hosts.old
9 KB/s (399 bytes in 0.041s)
Reading package lists... Done
Building dependency tree
Reading state information... Done
build-essential is already the newest version.
libboost-dev is already the newest version.
libssl-dev is already the newest version.
qt5-default is already the newest version.
qtbase5-dev is already the newest version.
qtdeclarative5-dev is already the newest version.
0 upgraded, 0 newly installed, 0 to remove and 3 not upgraded.
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
sending incremental file list

sent 11638 bytes received 77 bytes 23430.00 bytes/sec
total size is 3231629 speedup is 275.85
alan@deep-thought:/tmp/switch-to-cmake$ ./run_on_ubuntu_touch.sh
adbd is already running as root
start: Job is already running: ssh
Transferring code..
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
sending incremental file list

sent 11638 bytes received 77 bytes 23430.00 bytes/sec
total size is 3231629 speedup is 275.85
Building..
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
Connection to 127.0.0.1 closed.
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
bash: cmake: command not found
Connection to 127.0.0.1 closed.
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
make: *** No targets specified and no makefile found. Stop.
Connection to 127.0.0.1 closed.
Running..
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
bash: cd: reminders-app/builddir/src/app/: No such file or directory
Connection to 127.0.0.1 closed.
alan@deep-thought:/tmp/switch-to-cmake$ adb shell
root@ubuntu-phablet:/# sudo apt-get ^C
root@ubuntu-phablet:/# apt-get install cmake
Reading package lists... Done
Building dependency tree
Reading state information... Done
The following extra packages will be installed:
  cmake-data
Suggested packages:
  codeblocks eclipse
The following NEW packages will be installed:
  cmake cmake-data
0 upgraded, 2 newly installed, 0 to remove and 3 not upgraded.
Need to get 3002 kB of archives.
After this operation, 12.5 MB of additional disk space will be used.
Do you want to continue? [Y/n]
Get:1 http://ports.ubuntu.com/ubuntu-ports/ trusty/main cmake-data all 2.8.12.1-1ubuntu3 [675 kB]
Get:2 http://ports.ubuntu.com/ubuntu-ports/ trusty/main cmake armhf 2.8.12.1-1ubuntu3 [23...

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Other than that, it works okay once cmake is installed on device.

review: Needs Fixing

[lp:~mzanetti/reminders-app/switch-to-cmake]

45. By Michael Zanetti on 2014-01-07

added cmake to run_on_ubuntu_touch -s

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

FAILED: Continuous integration, rev:45
http://91.189.93.70:8080/job/reminders-app-ci/58/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/593/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/58/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/58/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/58/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/switch-to-cmake]

46. By Michael Zanetti on 2014-01-10

merge prerequisite

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

PASSED: Continuous integration, rev:46
http://91.189.93.70:8080/job/reminders-app-ci/61/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/640
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/61
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/61

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/61/rebuild

review: Approve (continuous-integration)

=== removed file '3rdParty/3rdParty.pro'
--- 3rdParty/3rdParty.pro	2013-11-21 23:30:15 +0000
+++ 3rdParty/3rdParty.pro	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = libthrift evernote-sdk-cpp
-
-evernote-sdk-cpp.depends = libthrift

=== added file '3rdParty/CMakeLists.txt'
--- 3rdParty/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ 3rdParty/CMakeLists.txt	2014-01-10 12:07:36 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(libthrift)
+add_subdirectory(evernote-sdk-cpp)

=== added file '3rdParty/evernote-sdk-cpp/CMakeLists.txt'
--- 3rdParty/evernote-sdk-cpp/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ 3rdParty/evernote-sdk-cpp/CMakeLists.txt	2014-01-10 12:07:36 +0000
@@ -0,0 +1,21 @@
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/3rdParty/libthrift
+)
+
+SET(evernote-sdk-cpp_SRCS
+    src/Errors_constants.cpp
+    src/Errors_types.cpp
+    src/Limits_constants.cpp
+    src/Limits_types.cpp
+    src/NoteStore_constants.cpp
+    src/NoteStore.cpp
+    src/NoteStore_types.cpp
+    src/Types_constants.cpp
+    src/Types_types.cpp
+    src/UserStore_constants.cpp
+    src/UserStore.cpp
+    src/UserStore_types.cpp
+)
+
+add_library(evernote-sdk-cpp ${evernote-sdk-cpp_SRCS})

=== removed file '3rdParty/evernote-sdk-cpp/evernote-sdk-cpp.pro'
--- 3rdParty/evernote-sdk-cpp/evernote-sdk-cpp.pro	2013-11-21 23:30:15 +0000
+++ 3rdParty/evernote-sdk-cpp/evernote-sdk-cpp.pro	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-TEMPLATE = lib
-
-CONFIG = staticlib
-
-QMAKE_CXXFLAGS += -std=c++0x -fPIC
-
-INCLUDEPATH += ../libthrift
-
-LIBS += -L../libthrift -llibthrift
-
-SOURCES +=  src/Errors_constants.cpp \
-    src/Errors_types.cpp \
-    src/Limits_constants.cpp \
-    src/Limits_types.cpp \
-    src/NoteStore_constants.cpp \
-    src/NoteStore.cpp \
-    src/NoteStore_types.cpp \
-    src/Types_constants.cpp \
-    src/Types_types.cpp \
-    src/UserStore_constants.cpp \
-    src/UserStore.cpp \
-    src/UserStore_types.cpp
-
-HEADERS += src/Errors_constants.h \
-    src/Errors_types.h \
-    src/Limits_constants.h \
-    src/Limits_types.h \
-    src/NoteStore_constants.h \
-    src/NoteStore.h \
-    src/NoteStore_types.h \
-    src/Types_constants.h \
-    src/Types_types.h \
-    src/UserStore_constants.h \
-    src/UserStore.h \
-    src/UserStore_types.h

=== added file '3rdParty/libthrift/CMakeLists.txt'
--- 3rdParty/libthrift/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ 3rdParty/libthrift/CMakeLists.txt	2014-01-10 12:07:36 +0000
@@ -0,0 +1,40 @@
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_definitions( -DHAVE_CONFIG_H )
+
+SET(libthrift_SRCS
+    Thrift.cpp
+    TApplicationException.cpp
+    async/TAsyncChannel.cpp
+    async/TAsyncProtocolProcessor.cpp
+    #async/TEvhttpClientChannel.cpp
+    #async/TEvhttpServer.cpp
+    transport/TBufferTransports.cpp
+    transport/TFDTransport.cpp
+    transport/TFileTransport.cpp
+    transport/THttpClient.cpp
+    transport/THttpServer.cpp
+    transport/THttpTransport.cpp
+    transport/TServerSocket.cpp
+    transport/TSimpleFileTransport.cpp
+    transport/TSocket.cpp
+    transport/TSocketPool.cpp
+    transport/TSSLServerSocket.cpp
+    transport/TSSLSocket.cpp
+    transport/TTransportException.cpp
+    transport/TTransportUtils.cpp
+    transport/TZlibTransport.cpp
+    #concurrency/BoostMonitor.cpp
+    #concurrency/BoostMutex.cpp
+    #concurrency/BoostThreadFactory.cpp
+    concurrency/Monitor.cpp
+    concurrency/Mutex.cpp
+    concurrency/PosixThreadFactory.cpp
+    concurrency/ThreadManager.cpp
+    concurrency/TimerManager.cpp
+    concurrency/Util.cpp
+)
+
+add_library(libthrift ${libthrift_SRCS})

=== removed file '3rdParty/libthrift/libthrift.pro'
--- 3rdParty/libthrift/libthrift.pro	2013-11-21 23:30:15 +0000
+++ 3rdParty/libthrift/libthrift.pro	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-TEMPLATE = lib
-
-CONFIG = staticlib
-
-QMAKE_CXXFLAGS += -std=c++0x -fPIC
-
-LIBS += -lssl -lcrypto
-
-DEFINES += HAVE_CONFIG_H
-
-SOURCES += Thrift.cpp \
-    TApplicationException.cpp \
-    async/TAsyncChannel.cpp \
-    async/TAsyncProtocolProcessor.cpp \
-    #async/TEvhttpClientChannel.cpp \
-    #async/TEvhttpServer.cpp \
-    transport/TBufferTransports.cpp \
-    transport/TFDTransport.cpp \
-    transport/TFileTransport.cpp \
-    transport/THttpClient.cpp \
-    transport/THttpServer.cpp \
-    transport/THttpTransport.cpp \
-    transport/TServerSocket.cpp \
-    transport/TSimpleFileTransport.cpp \
-    transport/TSocket.cpp \
-    transport/TSocketPool.cpp \
-    transport/TSSLServerSocket.cpp \
-    transport/TSSLSocket.cpp \
-    transport/TTransportException.cpp \
-    transport/TTransportUtils.cpp \
-    transport/TZlibTransport.cpp \
-    #concurrency/BoostMonitor.cpp \
-    #concurrency/BoostMutex.cpp \
-    #concurrency/BoostThreadFactory.cpp \
-    concurrency/Monitor.cpp \
-    concurrency/Mutex.cpp \
-    concurrency/PosixThreadFactory.cpp \
-    concurrency/ThreadManager.cpp \
-    concurrency/TimerManager.cpp \
-    concurrency/Util.cpp \
-
-HEADERS += config.h
-

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2014-01-10 12:07:36 +0000
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.8.9)
+
+project(reminders-app C CXX)
+
+set(CMAKE_AUTOMOC ON)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra -fPIC")
+
+add_subdirectory(3rdParty)
+add_subdirectory(src)

=== modified file 'debian/control'
--- debian/control	2013-11-26 12:07:17 +0000
+++ debian/control	2014-01-10 12:07:36 +0000
@@ -1,7 +1,8 @@
 Source: reminders-app
 Priority: extra
 Maintainer: Ubuntu App Cats <[e-mail]>
-Build-Depends: debhelper (>= 9),
+Build-Depends: cmake,
+               debhelper (>= 9),
 	       gettext,
                libboost-dev,
                libssl-dev,

=== removed file 'reminders-app.pro'
--- reminders-app.pro	2013-11-22 18:51:32 +0000
+++ reminders-app.pro	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = 3rdParty src
-
-src.depends = 3rdParty
-
-check.target = check
-check.commands = "echo No tests yet"
-QMAKE_EXTRA_TARGETS = check

=== modified file 'run_on_ubuntu_touch.sh'
--- run_on_ubuntu_touch.sh	2013-11-22 22:35:37 +0000
+++ run_on_ubuntu_touch.sh	2014-01-10 12:07:36 +0000
@@ -16,7 +16,7 @@
 SUDO="echo $PASSWORD | sudo -S"
 NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'
 FLIPPED=false
-DEPS="qt5-default qtbase5-dev qtdeclarative5-dev libboost-dev libssl-dev"
+DEPS="qt5-default qtbase5-dev qtdeclarative5-dev libboost-dev libssl-dev cmake"
 
 exec_with_ssh() {
     ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -t $USER@$TARGET_IP -p $TARGET_SSH_PORT sudo -u $USER -i bash -ic \"$@\"
@@ -61,8 +61,7 @@
 
 build() {
     exec_with_ssh mkdir -p $CODE_DIR/$BUILD_DIR
-    exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/$BUILD_DIR && PATH=/usr/lib/ccache:$PATH qmake --version"
-    exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/$BUILD_DIR && PATH=/usr/lib/ccache:$PATH QT_SELECT=qt5 qmake .."
+    exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/$BUILD_DIR && PATH=/usr/lib/ccache:$PATH QT_SELECT=qt5 cmake .."
     exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/$BUILD_DIR && PATH=/usr/lib/ccache:$PATH make -j2"
 }
 

=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt	2014-01-10 12:07:36 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(plugin)
+add_subdirectory(app)

=== added file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/app/CMakeLists.txt	2014-01-10 12:07:36 +0000
@@ -0,0 +1,15 @@
+file(GLOB_RECURSE QML_SRCS *.qml *.js)
+
+set(reminders-app_SRCS
+    main.cpp
+    ${QML_SRCS}
+)
+
+add_executable(reminders-app ${reminders-app_SRCS})
+
+qt5_use_modules(reminders-app Gui Qml Quick)
+
+add_custom_target(reminders-app-qmlfiles ALL
+    COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/qml ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ${QMLFILES}
+)

=== removed file 'src/app/app.pro'
--- src/app/app.pro	2013-12-15 01:57:25 +0000
+++ src/app/app.pro	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-TARGET = reminders-app
-TEMPLATE = app
-
-QT+= core qml quick
-
-SOURCES += main.cpp \
-
-OTHER_FILES = qml/reminders-app.qml \
-    qml/ui/NotebooksPage.qml \
-    qml/ui/RemindersPage.qml \
-    qml/ui/NotesPage.qml \
-    qml/ui/AccountSelectorPage.qml \
-    qml/ui/NotePage.qml \
-    qml/ui/SearchNotesPage.qml \
-    qml/components/ToolbarSpacer.qml \
-    qml/components/NotesDelegate.qml \
-    qml/components/NotebooksDelegate.qml \
-    qml/ui/EditNotePage.qml
-
-# Copy qml to build dir for running with qtcreator
-qmlfolder.source = src/app/qml
-qmlfolder.target = .
-DEPLOYMENTFOLDERS = qmlfolder
-
-include(../../deployment.pri)

=== added file 'src/plugin/CMakeLists.txt'
--- src/plugin/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/plugin/CMakeLists.txt	2014-01-10 12:07:36 +0000
@@ -0,0 +1,6 @@
+include(FindPkgConfig)
+find_package(Qt5Core)
+find_package(Qt5Qml)
+find_package(Qt5Quick)
+
+add_subdirectory(Evernote)

=== added file 'src/plugin/Evernote/CMakeLists.txt'
--- src/plugin/Evernote/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/CMakeLists.txt	2014-01-10 12:07:36 +0000
@@ -0,0 +1,53 @@
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/3rdParty/libthrift
+    ${CMAKE_SOURCE_DIR}/3rdParty/evernote-sdk-cpp/src/
+)
+
+set(evernoteplugin_SRCS
+    evernoteplugin.cpp
+    notesstore.cpp
+    userstore.cpp
+    notebooks.cpp
+    notes.cpp
+    note.cpp
+    notebook.cpp
+    jobs/fetchnotesjob.cpp
+    jobs/fetchnotebooksjob.cpp
+    jobs/fetchnotejob.cpp
+    jobs/createnotejob.cpp
+    jobs/evernotejob.cpp
+    jobs/savenotejob.cpp
+    jobs/deletenotejob.cpp
+    evernoteconnection.cpp
+    jobs/userstorejob.cpp
+    jobs/notesstorejob.cpp
+    jobs/fetchusernamejob.cpp
+    jobs/createnotebookjob.cpp
+    jobs/expungenotebookjob.cpp
+    resourceimageprovider.cpp
+    utils/enmldocument.cpp
+)
+
+add_library(evernoteplugin MODULE
+    ${evernoteplugin_SRCS}
+)
+
+target_link_libraries(evernoteplugin
+    -L${CMAKE_BINARY_DIR}/3rdParty/evernote-sdk-cpp/ -L${CMAKE_BINARY_DIR}/3rdParty/libthrift/ -levernote-sdk-cpp -llibthrift -lssl -lcrypto
+)
+
+qt5_use_modules(evernoteplugin Gui Qml Quick)
+
+
+# Copy qmldir file to build dir for running in QtCreator
+add_custom_target(evernoteplugin-qmldir ALL
+    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ${QMLFILES}
+)
+
+# Install plugin file
+exec_program(qmake ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR)
+install(TARGETS evernoteplugin DESTINATION ${QT_IMPORTS_DIR}/Evernote/)
+install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/Evernote/)
+

=== removed file 'src/plugin/Evernote/Evernote.pro'
--- src/plugin/Evernote/Evernote.pro	2013-12-14 22:38:57 +0000
+++ src/plugin/Evernote/Evernote.pro	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-TARGET=evernoteplugin
-TEMPLATE=lib
-CONFIG = qt plugin
-QT += qml gui xml quick
-QMAKE_CXXFLAGS += -std=c++0x -fPIC
-
-INCLUDEPATH += ../../../3rdParty/evernote-sdk-cpp/src/ ../../../3rdParty/libthrift
-
-TARGET = $$qtLibraryTarget($$TARGET)
-uri = Evernote
-
-SOURCES += evernoteplugin.cpp \
-    notesstore.cpp \
-    userstore.cpp \
-    notebooks.cpp \
-    notes.cpp \
-    note.cpp \
-    notebook.cpp \
-    jobs/fetchnotesjob.cpp \
-    jobs/fetchnotebooksjob.cpp \
-    jobs/fetchnotejob.cpp \
-    jobs/createnotejob.cpp \
-    jobs/evernotejob.cpp \
-    jobs/savenotejob.cpp \
-    jobs/deletenotejob.cpp \
-    evernoteconnection.cpp \
-    jobs/userstorejob.cpp \
-    jobs/notesstorejob.cpp \
-    jobs/fetchusernamejob.cpp \
-    jobs/createnotebookjob.cpp \
-    jobs/expungenotebookjob.cpp \
-    resourceimageprovider.cpp \
-    utils/enmldocument.cpp
-
-HEADERS += evernoteplugin.h \
-    notesstore.h \
-    userstore.h \
-    notebooks.h \
-    notes.h \
-    note.h \
-    notebook.h \
-    jobs/fetchnotesjob.h \
-    jobs/fetchnotebooksjob.h \
-    jobs/fetchnotejob.h \
-    jobs/createnotejob.h \
-    jobs/evernotejob.h \
-    jobs/savenotejob.h \
-    jobs/deletenotejob.h \
-    evernoteconnection.h \
-    jobs/userstorejob.h \
-    jobs/notesstorejob.h \
-    jobs/fetchusernamejob.h \
-    jobs/createnotebookjob.h \
-    jobs/expungenotebookjob.h \
-    resourceimageprovider.h \
-    utils/enmldocument.h
-
-message(building in $$OUT_PWD)
-LIBS += -L$$OUT_PWD/../../../3rdParty/evernote-sdk-cpp/ -L$$OUT_PWD/../../../3rdParty/libthrift/ -levernote-sdk-cpp -llibthrift -lssl -lcrypto
-
-installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
-qmldir.files = qmldir
-qmldir.path = $$installPath
-target.path = $$installPath
-INSTALLS += target qmldir
-
-# Copy qml to build dir
-qmldir.source = src/plugin/Evernote/qmldir
-qmldir.target = .
-DEPLOYMENTFOLDERS = qmldir
-include(../../../deployment.pri)

=== removed file 'src/plugin/plugin.pro'
--- src/plugin/plugin.pro	2013-11-21 23:30:15 +0000
+++ src/plugin/plugin.pro	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = Evernote

=== removed file 'src/src.pro'
--- src/src.pro	2013-11-21 23:30:15 +0000
+++ src/src.pro	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += plugin app