~osomon/webbrowser-app/http-auth

« back to all changes in this revision

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

  • Committer: Olivier Tilloy
  • Date: 2015-09-01 07:02:13 UTC
  • mfrom: (992.27.83 webbrowser-app)
  • Revision ID: olivier.tilloy@canonical.com-20150901070213-etg27ht61h43709f
Merge the latest changes from trunk and resolve a few conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
find_package(Qt5Qml REQUIRED)
5
5
find_package(Qt5Quick REQUIRED)
6
6
find_package(Qt5QuickTest REQUIRED)
 
7
find_package(Qt5Sql REQUIRED)
7
8
 
8
9
set(XVFB_COMMAND)
9
10
find_program(XVFBRUN xvfb-run)
16
17
set(TEST tst_QmlTests)
17
18
set(SOURCES
18
19
    ${webbrowser-common_SOURCE_DIR}/favicon-fetcher.cpp
 
20
    ${webbrowser-app_SOURCE_DIR}/bookmarks-model.cpp
 
21
    ${webbrowser-app_SOURCE_DIR}/bookmarks-folder-model.cpp
 
22
    ${webbrowser-app_SOURCE_DIR}/bookmarks-folderlist-model.cpp
19
23
    ${webbrowser-app_SOURCE_DIR}/file-operations.cpp
 
24
    ${webbrowser-app_SOURCE_DIR}/history-model.cpp
 
25
    ${webbrowser-app_SOURCE_DIR}/history-lastvisitdate-model.cpp
 
26
    ${webbrowser-app_SOURCE_DIR}/history-lastvisitdatelist-model.cpp
 
27
    ${webbrowser-app_SOURCE_DIR}/history-timeframe-model.cpp
 
28
    ${webbrowser-app_SOURCE_DIR}/limit-proxy-model.cpp
20
29
    ${webbrowser-app_SOURCE_DIR}/searchengine.cpp
21
30
    ${webbrowser-app_SOURCE_DIR}/tabs-model.cpp
 
31
    ${webbrowser-app_SOURCE_DIR}/top-sites-model.cpp
22
32
    tst_QmlTests.cpp
23
33
)
24
34
add_executable(${TEST} ${SOURCES})
33
43
    Qt5::Qml
34
44
    Qt5::Quick
35
45
    Qt5::QuickTest
 
46
    Qt5::Sql
36
47
)
37
48
add_test(${TEST} ${XVFB_COMMAND} ${CMAKE_CURRENT_BINARY_DIR}/${TEST}
38
49
         -input ${CMAKE_CURRENT_SOURCE_DIR}