| akulichalexandr |
| KDE Telepathy |
This adds two commits from
git://anongit.freedesktop.org/telepathy/telepathy-qt:
While the latter is certainly nicer to look at, the former is necessary to
build with cmake 3.9. Otherwise it fails with "IOError: [Errno 2] No such
file or directory: '<buildir>/TelepathyLoggerQt/_gen/spec-logger.xml'".
Builds fine with cmake 3.9
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
LGTM, though I would like to have the two commits separately.
Take a note that the sources are hosted at https://github.com/TelepathyIM/telepathy-qt for a while [1]. We'll keep fd.o repositories in sync, but encourage you to use the new one for issue and code submissions.
[1] https://www.mail-archive.com/telepathy@lists.freedesktop.org/msg06582.html
Thanks for looking into this
| cmake/modules/TpQtMacros.cmake | ||
|---|---|---|
| 181 | why this change? given we're still using qt5_get_moc_flags above? | |
| cmake/modules/TpQtMacros.cmake | ||
|---|---|---|
| 181 | ||
| cmake/modules/TpQtMacros.cmake | ||
|---|---|---|
| 181 | I misread your comment. | |
Split commits, adjusted commit message accordingly and removed
accidentally included part.
| cmake/modules/TpQtMacros.cmake | ||
|---|---|---|
| 181 | Upstream t-l-qt differ there and I accidentally included it. It was renamed from 'qt' to 'qt5' in t-l-q with commit: 594d2c32c1bd088e98f32a4b88500b5f4ffdc7e1 | |