Ubuntu File Manager App

Merge lp:~carlos-mazieri/ubuntu-filemanager-app/app-placemodel-plugin into lp:ubuntu-filemanager-app

  1. app-placemodel-plugin
  2. Merge into trunk
Proposed by Carlos Jose Mazieri
Status: Merged
Approved by: Carlos Jose Mazieri
Approved revision: 252
Merged at revision: 256
Proposed branch: lp:~carlos-mazieri/ubuntu-filemanager-app/app-placemodel-plugin
Merge into: lp:ubuntu-filemanager-app
Diff against target: 12 lines (+1/-1)
1 file modified
src/plugin/placesmodel/placesmodel_plugin.cpp (+1/-1)
To merge this branch: bzr merge lp:~carlos-mazieri/ubuntu-filemanager-app/app-placemodel-plugin
Reviewer Review Type Date Requested Status
Carlos Jose Mazieri Approve
Arto Jalkanen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+230611@code.launchpad.net

Commit message

Fixed PlacesModel uri.

Description of the change

Fixed PlacesModel uri.

I Got a compiler error when building latest version of filemanager:

ubuntu-filemanager-app/src/plugin/placesmodel/placesmodel_plugin.cpp:26:52:
     error: ‘QUOTES’ was not declared in this scope
            Q_ASSERT(uri == QLatin1String(QUOTES(PLUGIN_URI)));

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:252
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/302/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1506
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1506/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/100

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/302/rebuild

review: Approve (continuous-integration)
Revision history for this message
Arto Jalkanen (ajalkane) :
review: Approve
Revision history for this message
Carlos Jose Mazieri (carlos-mazieri) wrote :

I am going to approve it toplevel myself in order to get it merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/plugin/placesmodel/placesmodel_plugin.cpp'
2--- src/plugin/placesmodel/placesmodel_plugin.cpp 2014-06-21 21:59:52 +0000
3+++ src/plugin/placesmodel/placesmodel_plugin.cpp 2014-08-13 12:07:10 +0000
4@@ -23,7 +23,7 @@
5
6 void BackendPlugin::registerTypes(const char *uri)
7 {
8- Q_ASSERT(uri == QLatin1String(QUOTES(PLUGIN_URI)));
9+ Q_ASSERT(uri == QLatin1String("com.ubuntu.PlacesModel"));
10
11 qmlRegisterType<PlacesModel>(uri, 0, 1, "PlacesModel");
12 }

Subscribers

People subscribed via source and target branches