← Back to branch summary

~osomon/webbrowser-app/uriboni-tab-context-menu

« back to all changes in this revision

Viewing changes to tests/unittests/qml/CMakeLists.txt

  • Committer: Olivier Tilloy
  • Date: 2015-09-23 18:43:10 UTC
  • mfrom: (1131.26.14 webbrowser-app)
  • Revision ID: olivier.tilloy@canonical.com-20150923184310-hyff8vgwcyurj2tv
Merge the latest changes from trunk and resolve a conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unittests/qml/CMakeLists.txt
28
28
    ${webbrowser-app_SOURCE_DIR}/limit-proxy-model.cpp
29
29
    ${webbrowser-app_SOURCE_DIR}/searchengine.cpp
30
30
    ${webbrowser-app_SOURCE_DIR}/tabs-model.cpp
 
31
    ${webbrowser-app_SOURCE_DIR}/text-search-filter-model.cpp
31
32
    ${webbrowser-app_SOURCE_DIR}/top-sites-model.cpp
32
33
    tst_QmlTests.cpp
33
34
)