← Back to branch summary

~mutse-young/ubuntu-docviewer-app/trunk

~mutse-young/ubuntu-docviewer-app/trunk

« back to all changes in this revision

Viewing changes to src/plugin/CMakeLists.txt

Committer: David Planella
Date: 2014-10-28 22:01:16 UTC
mfrom: (31.2.8 add-poppler-plugin)
mto: This revision was merged to the branch mainline in revision 35.
Revision ID: david.planella@ubuntu.com-20141028220116-bryaeq3if69o6r6o

Merged branch to add Poppler plugin

files added:
src/plugin/poppler-qml-plugin

src/plugin/poppler-qml-plugin/CMakeLists.txt

src/plugin/poppler-qml-plugin/pageImageProvider.cpp

src/plugin/poppler-qml-plugin/pageImageProvider.h

src/plugin/poppler-qml-plugin/pagesWorkerThread.cpp

src/plugin/poppler-qml-plugin/pagesWorkerThread.h

src/plugin/poppler-qml-plugin/pdfModel.cpp

src/plugin/poppler-qml-plugin/pdfModel.h

src/plugin/poppler-qml-plugin/pdfPage.cpp

src/plugin/poppler-qml-plugin/pdfPage.h

src/plugin/poppler-qml-plugin/plugin.cpp

src/plugin/poppler-qml-plugin/plugin.h

src/plugin/poppler-qml-plugin/qmldir

files modified:
src/app/qml/PdfPage.qml

src/app/qml/PdfView.qml

src/app/qml/ubuntu-docviewer-app.qml

src/plugin/CMakeLists.txt

tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py

Show diffs side-by-side

added added

removed removed

src/plugin/CMakeLists.txt

1

1

add_subdirectory(file-qml-plugin)

2

add_subdirectory(poppler-qml-plugin)

Older »