qtubuntu

Merge lp:~dandrader/qtubuntu/ApplicationInfo into lp:qtubuntu

  1. ApplicationInfo
  2. Merge into trunk
Proposed by Daniel d'Andrada
Status: Merged
Approved by: Loïc Molinari
Approved revision: 127
Merged at revision: 127
Proposed branch: lp:~dandrader/qtubuntu/ApplicationInfo
Merge into: lp:qtubuntu
Diff against target: 12 lines (+1/-1)
1 file modified
src/modules/application/plugin.cc (+1/-1)
To merge this branch: bzr merge lp:~dandrader/qtubuntu/ApplicationInfo
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+160870@code.launchpad.net

Commit message

Export Application as ApplicationInfo to avoid clashing with QtQuick.Application

Description of the change

Export Application as ApplicationInfo to avoid clashing with the Application component from QtQuick module.

Otherwise we cannot use enumerations from Application (like Application.MainStage) unless we import Ubuntu.Application in a separate namespace (e.g. "import Ubuntu.Application 0.1 as UA), which is quite inconvenient.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:127
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-raring-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-raring-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-ci/6/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/application/plugin.cc'
2--- src/modules/application/plugin.cc 2013-02-14 16:31:33 +0000
3+++ src/modules/application/plugin.cc 2013-04-25 11:59:31 +0000
4@@ -40,7 +40,7 @@
5 qmlRegisterSingletonType<ApplicationManager>(
6 uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
7 qmlRegisterUncreatableType<Application>(
8- uri, 0, 1, "Application", "Application can't be instantiated");
9+ uri, 0, 1, "ApplicationInfo", "ApplicationInfo can't be instantiated");
10 qmlRegisterUncreatableType<ApplicationListModel>(
11 uri, 0, 1, "ApplicationListModel", "ApplicationListModel can't be instantiated");
12 qmlRegisterExtendedType<QQuickWindow, ApplicationWindow>(uri, 0, 1, "Window");

Subscribers

People subscribed via source and target branches