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

Proposed by Michał Sawicz
Status: Superseded
Proposed branch: lp://qastaging/~saviq/dee-qt/qt4_and_qt5
Merge into: lp://qastaging/dee-qt/0.2
Diff against target: 423 lines (+197/-45)
13 files modified
CMakeLists.txt (+60/-33)
debian/changelog (+6/-0)
debian/compat (+1/-1)
debian/control (+17/-2)
debian/libqtdee-qt5-dev.install (+2/-0)
debian/libqtdee-qt5.install (+3/-0)
debian/libqtdee-qt5.symbols (+34/-0)
debian/libqtdee2.symbols (+3/-0)
debian/rules (+32/-3)
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/~saviq/dee-qt/qt4_and_qt5
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Needs Fixing
Review via email: mp+134181@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-11-12.

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

Description of the change

Build libqtdee for Qt5 as well

There are two new packages:
libqtdee-qt5
libqtdee-qt5-dev

This relies on ppa:canonical-qt5-edgers/qt5-beta1, so it's probably not merge-able properly yet

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

It's looking pretty good. However, first some things to fix before merging it:
- Don't install it in /opt/qt5 and directly install it in a qt5-based system lib/ directory.
- the symbols files shouldn't have the ubuntu version in it, just the upstream one.
- for coherence with the other packages, we need to set Vcs-Bzr for other people touching the package, have the build-dep ordered, install --fail-missing and using GENSYMBOL level 4 to not miss anything in the symbols file.

I can help you with the last item, can you push the branch on ~unity-team so that I can add those revs?

review: Needs Fixing
Revision history for this message
Michał Sawicz (saviq) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

W dniu 14.11.2012 06:35, Didier Roche pisze:
> It's looking pretty good. However, first some things to fix before
> merging it: - Don't install it in /opt/qt5 and directly install it
> in a qt5-based system lib/ directory.

Of course, problem is that the actual plugin needs to go into
/opt/qt5/imports anyway (and we don't seem to have a variable to use
to find out that path, will dig).

> - the symbols files shouldn't have the ubuntu version in it, just
> the upstream one.

I just used gensymbols, is there a switch I should use or should I
just tweak the file by hand?

> - for coherence with the other packages, we need to set Vcs-Bzr for
> other people touching the package, have the build-dep ordered,
> install --fail-missing and using GENSYMBOL level 4 to not miss
> anything in the symbols file.

Sure, doing.

> I can help you with the last item, can you push the branch on
> ~unity-team so that I can add those revs?

Cheers!
- --
Michał Sawicz <email address hidden>
Canonical Services Ltd.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQo2FVAAoJEGnv7NPGHSZFDjEQAIWrcDMqTNNvNTFPkq2c8pqn
Ndi9TKfhbqMhcQwehUzIB1hmVeaV4LcNhVqrT1oC9bEhVG053AhdtSbnCF/FcNbK
oeARLfbeDpJesO8fa3u+tfOANAEdiO4B4jyw3DO/pblAhWxN6tFLhUKTqnH7kdWU
2Q24qz2GmYPZ6qebJKvFNHG6X2qxRMp3AjrdQ6pRTEexU3XP0Qr9hOTNkabHKyyg
4Ud03E15bDE9IF7iUgubQLZzx2DC1PrlwZAiie0KIOqQv1M0Rk3koi+TEApz7aWE
piXlL/YWluZ3nxx+6hpORg0pwhSgImAyOWj4o+c1V/lxQ27jiiS7e41fOmDyGGgZ
JNzBHWSBGqw/uxfRohiUnDo4TrxUiwQFfb5oFPnnsXEzVFzi/X/uBnXk0nI8pUin
tN2KTgf228jt/PBndVzgTz3Q9K3pEEPI/wFkHESASveQGnBiJXIejUrgdGsLR9D7
kkZCp1dDLXDQKYYMUeVSp4WFb4MWj1Gd8IQLGLPygW7zI4xa9DyGez3GnbRdVO5t
yZdnmjEsMjqxjraM+ZoBhtzjMfS/eUz1d0yRJXgtZ8x6qTHBohSmi0kG1BoIsSQQ
jC1PsMRmJYFd6P45nJvLIGbI8stMIZ6oxSNlYmMfCty331l/CWxZXAAxW9mbwIAz
4U4VU05lsmHtpTfNcQ5W
=8qM5
-----END PGP SIGNATURE-----

Unmerged revisions

74. By Michał Sawicz

[debian] build both qt4 and qt5 versions

73. By Michał Sawicz

drop empty build dir

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