Nomovok #7
Closed
Nomovok #7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…acts and deleting contact goes back to contact list
…n be changed by main.qml
|
woah. please read up on git rebase -i (and git commit --amend) to create somewhat of a sane history, please |
| @@ -0,0 +1,79 @@ | |||
| # | |||
There was a problem hiding this comment.
don't fork the packaging for apps - just port it to qt5 (see the other ports for examples)
there's not enough people working on this code to justify having both qt4 and qt5 versions
There was a problem hiding this comment.
Ok. when I read the history, I think, I did mess up with merging. Sorry, I fix those and try again.
|
|
||
| import QtQuick 2.0 | ||
| import com.nokia.meego 2.0 | ||
| //import org.nemomobile.qmlcontacts 1.0 |
|
This has merge conflicts, and has not seen any updates from Robin's feedback. Closing this. Please reopen if you still want to get this in. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Few changeses:
(if you want to disable all these changes, except qt4 -> qt5, possible too, no need to pull library changes, just edit little qmlcontacts and fix error messages)