Merge lp:~osomon/webbrowser-app/fix-tabsmodel-ut-qt56 into lp:webbrowser-app

[Olivier Tilloy]

Fix a failing unit test with Qt 5.6.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1393
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/1/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/1/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/1/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/1/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/2/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'tests/unittests/tabs-model/tst_TabsModelTests.cpp'
--- tests/unittests/tabs-model/tst_TabsModelTests.cpp	2015-12-03 11:20:43 +0000
+++ tests/unittests/tabs-model/tst_TabsModelTests.cpp	2016-04-04 10:22:23 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -33,11 +33,11 @@
     Q_OBJECT
 
 private:
+    QQmlEngine engine;
     TabsModel* model;
 
     QQuickItem* createTab()
     {
-        QQmlEngine engine;
         QQmlComponent component(&engine);
         QByteArray data("import QtQuick 2.4\nItem {\nproperty url url\n"
                         "property string title\nproperty url icon\n}");