~ken-vandine/address-book-app/add_profile

Viewing changes to src/app/addressbookapp.cpp

Committer: CI bot
Author(s): Tarmac, Renato Araujo Oliveira Filho
Date: 2014-07-04 14:55:22 UTC
mfrom: (169.22.12 release-2014-07-02)
Revision ID: ps-jenkins@lists.canonical.com-20140704145522-7r65oy9m1zarc7yz

* Implemented MostCalledContactsModel in C++ as a proxy model for HistoryEventModel;
* Enabled share button again.
* Fixed build warning: comparison with string literal results in unspecified behavior;
* Implemented swipe to delete. Fixes: 1323577

files added:
src/imports/Ubuntu/Contacts/ListItemWithActions.qml

src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp

src/imports/Ubuntu/Contacts/mostcalledproxymodel.h

src/imports/Ubuntu/Contacts/plugin.cpp

src/imports/Ubuntu/Contacts/plugin.h

tests/qml

tests/qml/CMakeLists.txt

tests/qml/tst_ContactEditor.qml

files renamed:
README.click => README

files modified:
debian/control

po/address-book-app.pot

src/app/addressbookapp.cpp

src/imports/CMakeLists.txt

src/imports/Common/ContactDetailBase.qml

src/imports/ContactList/ContactListPage.qml

src/imports/ContactView/ContactView.qml

src/imports/Ubuntu/Contacts/CMakeLists.txt

src/imports/Ubuntu/Contacts/ContactDelegate.qml

src/imports/Ubuntu/Contacts/ContactListView.qml

src/imports/Ubuntu/Contacts/ContactSimpleListView.qml

src/imports/Ubuntu/Contacts/MostCalledModel.qml

src/imports/Ubuntu/Contacts/qmldir

tests/CMakeLists.txt

tests/autopilot/address_book_app/tests/test_add_contact.py

Show diffs side-by-side

added added

removed removed

src/app/addressbookapp.cpp

QString appPath = QCoreApplication::applicationDirPath();

if (appPath.startsWith(ADDRESS_BOOK_DEV_BINDIR)) {

return QString(ADDRESS_BOOK_APP_DEV_DATADIR) + suffix;

} else if (QT_EXTRA_IMPORTS_DIR != ""){

} else if (!QStringLiteral(QT_EXTRA_IMPORTS_DIR).isEmpty()) {

return QString(QT_EXTRA_IMPORTS_DIR) + suffix;

} else {

return "";

Older »