[Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-27 Thread noreply
The proposal to merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into 
lp:ubuntu-ui-toolkit/staging has been updated.

Status: Approved => Merged

For more details, see:
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
-- 
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-27 Thread ubuntu-sdk-build-bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1685/
Executed test runs:
None: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7786/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1685/rebuild

-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-27 Thread ubuntu-sdk-build-bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1470/
Executed test runs:
None: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7785/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1470/rebuild

-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-27 Thread Christian Dywan
The proposal to merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into 
lp:ubuntu-ui-toolkit/staging has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
-- 
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-16 Thread Christian Dywan
The proposal to merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into 
lp:ubuntu-ui-toolkit/staging has been updated.

Description changed to:

https://bileto.ubuntu.com/#/ticket/2478

For more details, see:
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
-- 
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-09 Thread ubuntu-sdk-build-bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1656/
Executed test runs:
None: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7658/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1656/rebuild

-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-09 Thread ubuntu-sdk-build-bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/898/
Executed test runs:
SUCCESS: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1656
SUCCESS: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1441
SUCCESS: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1406
SUCCESS: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/220
None: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7659/console
SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7658
SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7657
SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7656
SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7655

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/898/rebuild

-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-09 Thread ubuntu-sdk-build-bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1441/
Executed test runs:
None: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7657/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1441/rebuild

-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-09 Thread ubuntu-sdk-build-bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/220/
Executed test runs:
None: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7655/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/220/rebuild

-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-09 Thread ubuntu-sdk-build-bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:2171
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1406/
Executed test runs:
None: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7656/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1406/rebuild

-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-09 Thread ubuntu-sdk-build-bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/219/
Executed test runs:
None: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7653/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/219/rebuild

-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-09 Thread ubuntu-sdk-build-bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1655/
Executed test runs:
None: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7652/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1655/rebuild

-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-09 Thread ubuntu-sdk-build-bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/897/
Executed test runs:
SUCCESS: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1655
SUCCESS: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1440
SUCCESS: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1405
SUCCESS: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/219
None: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7654/console
SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7652
SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7651
SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7650
SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7653

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/897/rebuild

-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-09 Thread ubuntu-sdk-build-bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1440/
Executed test runs:
None: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7651/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1440/rebuild

-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-09 Thread ubuntu-sdk-build-bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:2170
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1405/
Executed test runs:
None: 
https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7650/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1405/rebuild

-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-09 Thread Tim Peeters
Review: Approve

lgtm
-- 
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit/staging.

-- 
Mailing list: https://launchpad.net/~ubuntu-sdk-team
Post to : ubuntu-sdk-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-sdk-team
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-sdk-team] [Merge] lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into lp:ubuntu-ui-toolkit/staging

2017-02-09 Thread Christian Dywan
Christian Dywan has proposed merging 
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into 
lp:ubuntu-ui-toolkit/staging.

Commit message:
Initialize UCApplication with no side effects

Requested reviews:
  Ubuntu SDK team (ubuntu-sdk-team)
Related bugs:
  Bug #1662868 in ubuntu-ui-toolkit (Ubuntu): "Changes to organizationName 
management break qt-labs-settings"
  https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1662868

For more details, see:
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime/+merge/316825
-- 
Your team Ubuntu SDK team is requested to review the proposed merge of 
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedCrime into 
lp:ubuntu-ui-toolkit/staging.
=== modified file 'src/UbuntuToolkit/ucapplication.cpp'
--- src/UbuntuToolkit/ucapplication.cpp	2017-01-12 15:20:31 +
+++ src/UbuntuToolkit/ucapplication.cpp	2017-02-09 11:08:07 +
@@ -39,8 +39,6 @@
 UCApplication::UCApplication(QObject* parent) : QObject(parent), m_context(0)
, m_inputMethod(QGuiApplication::inputMethod())
 {
-// Unset organization by default to skip an extra folder component
-QCoreApplication::setOrganizationName(QStringLiteral(""));
 // Make sure we receive application name changes from C++ modules
 connect(QCoreApplication::instance(), &QCoreApplication::applicationNameChanged,
 this, &UCApplication::applicationNameChanged);
@@ -70,7 +68,6 @@
to how Unity uses it to distinguish running applications.
  */
 QCoreApplication::setApplicationName(applicationName);
-QCoreApplication::setOrganizationName(QCoreApplication::organizationName());
 /*
Ensure that LocalStorage and WebKit use the same location
Docs are ambiguous: in practise applicationName is ignored by default

=== modified file 'src/UbuntuToolkit/ucmainwindow.cpp'
--- src/UbuntuToolkit/ucmainwindow.cpp	2017-01-18 17:23:48 +
+++ src/UbuntuToolkit/ucmainwindow.cpp	2017-02-09 11:08:07 +
@@ -163,11 +163,7 @@
 return;
 
 d->m_applicationName = applicationName;
-
-if (applicationName != QStringLiteral("")) {
-UbuntuI18n::instance()->setDomain(applicationName);
-UCApplication::instance()->setApplicationName(applicationName);
-}
+updateApplication(applicationName, d->m_organizationName);
 Q_EMIT applicationNameChanged(applicationName);
 }
 
@@ -192,11 +188,17 @@
 return;
 
 d->m_organizationName = organizationName;
+updateApplication(d->m_applicationName, organizationName);
+Q_EMIT organizationNameChanged(organizationName);
+}
 
-if (organizationName != QStringLiteral("")) {
+void UCMainWindow::updateApplication(QString applicationName, QString organizationName)
+{
+if (applicationName != QStringLiteral("")) {
+UbuntuI18n::instance()->setDomain(applicationName);
 QCoreApplication::setOrganizationName(organizationName);
+UCApplication::instance()->setApplicationName(applicationName);
 }
-Q_EMIT organizationNameChanged(organizationName);
 }
 
 /*!

=== modified file 'src/UbuntuToolkit/ucmainwindow_p.h'
--- src/UbuntuToolkit/ucmainwindow_p.h	2017-01-16 16:52:57 +
+++ src/UbuntuToolkit/ucmainwindow_p.h	2017-02-09 11:08:07 +
@@ -76,6 +76,8 @@
 #endif
 
 private:
+void updateApplication(QString applicationName, QString organizationName);
+
 Q_DECLARE_PRIVATE(UCMainWindow)
 };
 

=== modified file 'tests/unit/mainwindow/VisualRoot.qml'
--- tests/unit/mainwindow/VisualRoot.qml	2017-01-16 14:18:21 +
+++ tests/unit/mainwindow/VisualRoot.qml	2017-02-09 11:08:07 +
@@ -20,7 +20,6 @@
 
 MainWindow {
 objectName: "visualRoot"
-applicationName: "org.gnu.wildebeest"
 visualRoot: myRoot
 
 Rectangle {

=== modified file 'tests/unit/mainwindow/tst_mainwindow.cpp'
--- tests/unit/mainwindow/tst_mainwindow.cpp	2017-01-16 17:44:23 +
+++ tests/unit/mainwindow/tst_mainwindow.cpp	2017-02-09 11:08:07 +
@@ -33,10 +33,7 @@
 #include 
 #include 
 
-#include 
-#include 
 #include 
-#include 
 #include 
 #include 
 
@@ -103,18 +100,23 @@
 
 private Q_SLOTS:
 
-void initTestCase()
-{
-}
-
-void cleanupTestCase()
-{
+void cleanup()
+{
+ // UCApplication::instance()->setApplicationName(QStringLiteral(""));
+// Delete engine, and thereby also the UCApplication instance
+QObject* engine(UCApplication::instance()->parent());
+delete engine;
+QCoreApplication::setApplicationName(QStringLiteral(""));
+QCoreApplication::setOrganizationName(QStringLiteral(""));
 }
 
 // Note: tests/unit/mainview13 contains the UCApplication bits
 
 void testCase_AppName()
 {
+// Sanity check: no name set yet
+QCOMPARE(QStringLiteral("mainwindow"), QCoreApplication::applicationName());
+
 QString applicationName("org.gnu.wildebeest");
 QQuickWindow *mainWindow(loadTest("App