lp://staging/~jamesh/thumbnailer/fix-pkg-config

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/thumbnailer/devel at revision 360

PS Jenkins bot (community): Approve (continuous-integration) on 2016-07-12

unity-api-1-bot: Approve (continuous-integration) on 2016-07-12

Unity Team: Pending requested 2016-07-12

Diff: 106 lines (+17/-23)

4 files modified

CMakeLists.txt (+8/-11)
include/internal/version.h.in (+3/-3)
include/unity/thumbnailer/qt/CMakeLists.txt (+2/-1)
src/libthumbnailer-qt/libthumbnailer-qt.pc.in (+4/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

361. By James Henstridge on 2016-07-12

Looks like Qt5::Network was only required for QML. Find that package
instead.

360. By James Henstridge on 2016-07-12

Do find_package on Qt5Network to see if that cleans up the vivid-overlay
bug.

359. By James Henstridge on 2016-07-12

Fix up pkg-config file, and simplify some of the cmake build files.

358. By Michi Henning on 2016-05-31

Merging 2.4+16.10.20160530.3-0ubuntu1 from trunk.

Approved by PS Jenkins bot.

357. By Michi Henning on 2016-05-30

Minor fix to stop complaint from ubsan.

Approved by James Henstridge, PS Jenkins bot.

356. By Michi Henning on 2016-04-08

Re-enable copyright/licence test for xenial.

Approved by James Henstridge, PS Jenkins bot.

355. By Michi Henning on 2016-04-07

Back-merge of 2.4+16.04.20160321-0ubuntu1 from trunk.

Approved by Michi Henning, PS Jenkins bot.

354. By Michi Henning on 2016-03-11

Removed #include <iostream> that was left behind after debugging.

Approved by PS Jenkins bot, James Henstridge.

353. By Michi Henning on 2016-03-03

Back-merge of 2.4+16.04.20160302.1-0ubuntu1 from trunk.

Approved by PS Jenkins bot, Michi Henning.

352. By Michi Henning on 2016-03-02

Minor fixes to man pages.

Approved by PS Jenkins bot, James Henstridge.