Merge lp://qastaging/~aacid/dee-qt/qt4_and_qt5 into lp://qastaging/dee-qt/0.2

Proposed by Albert Astals Cid
Status: Superseded
Proposed branch: lp://qastaging/~aacid/dee-qt/qt4_and_qt5
Merge into: lp://qastaging/dee-qt/0.2
Diff against target: 266 lines (+113/-34)
5 files modified
CMakeLists.txt (+74/-28)
libqtdee.pc.in (+2/-2)
plugin.cpp (+8/-2)
plugin.h (+14/-2)
test_qtquick2.qml (+15/-0)
To merge this branch: bzr merge lp://qastaging/~aacid/dee-qt/qt4_and_qt5
Reviewer Review Type Date Requested Status
unity-2d-team Pending
Review via email: mp+133910@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2012-11-13.

Commit message

qt4 and qt5 code port

debian folder missing

Description of the change

qt4 and qt5 code port

debian folder missing

To post a comment you must log in.

Unmerged revisions

72. By Albert Astals Cid

qt4 and qt5 code port

debian folder missing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches