← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/unittests/qml/tst_QmlTests.cpp

  • Committer: CI Train Bot
  • Author(s): Arthur Mello, Ugo Riboni, Olivier Tilloy
  • Date: 2015-08-12 19:53:13 UTC
  • mfrom: (1126.1.5 wide-views-newtab-history)
  • Revision ID: ci-train-bot@canonical.com-20150812195313-u5v7kzrj8hfiacsj
Wide screen versions of the history view and new tab view, per design specification.
This adds a build dependency on qml-module-qt-labs-settings (for unit tests). Fixes: #1351157, #1481647

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unittests/qml/tst_QmlTests.cpp
25
25
#include <QtQuickTest/QtQuickTest>
26
26
 
27
27
// local
 
28
#include "bookmarks-model.h"
 
29
#include "bookmarks-folderlist-model.h"
28
30
#include "favicon-fetcher.h"
29
31
#include "file-operations.h"
 
32
#include "history-model.h"
 
33
#include "history-timeframe-model.h"
 
34
#include "history-lastvisitdate-model.h"
 
35
#include "history-lastvisitdatelist-model.h"
 
36
#include "limit-proxy-model.h"
30
37
#include "searchengine.h"
31
38
#include "tabs-model.h"
 
39
#include "top-sites-model.h"
32
40
 
33
41
static QObject* FileOperations_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
34
42
{
116
124
    const char* browserUri = "webbrowserapp.private";
117
125
    qmlRegisterType<SearchEngine>(browserUri, 0, 1, "SearchEngine");
118
126
    qmlRegisterType<TabsModel>(browserUri, 0, 1, "TabsModel");
 
127
    qmlRegisterType<BookmarksModel>(browserUri, 0, 1, "BookmarksModel");
 
128
    qmlRegisterType<BookmarksFolderListModel>(browserUri, 0, 1, "BookmarksFolderListModel");
 
129
    qmlRegisterType<HistoryModel>(browserUri, 0, 1, "HistoryModel");
 
130
    qmlRegisterType<HistoryTimeframeModel>(browserUri, 0, 1, "HistoryTimeframeModel");
 
131
    qmlRegisterType<HistoryLastVisitDateListModel>(browserUri, 0, 1, "HistoryLastVisitDateListModel");
 
132
    qmlRegisterType<HistoryLastVisitDateModel>(browserUri, 0, 1, "HistoryLastVisitDateModel");
 
133
    qmlRegisterType<LimitProxyModel>(browserUri, 0, 1, "LimitProxyModel");
 
134
    qmlRegisterType<TopSitesModel>(browserUri, 0, 1, "TopSitesModel");
119
135
    qmlRegisterSingletonType<FileOperations>(browserUri, 0, 1, "FileOperations", FileOperations_singleton_factory);
120
136
 
121
137
    qmlRegisterSingletonType<TestContext>("webbrowsertest.private", 0, 1, "TestContext", TestContext_singleton_factory);