[mythtv-firehose] mythtv branch master updated by stuartm. v0.28-pre-2616-g7db447a

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user stuartm.
       via  7db447ae43b8352a39a75868ba8a31739fe3dec3 (commit)
       via  28849639fe48fce4e9d2f1c4c0be8c09c3de6f0c (commit)
       via  585c04077b556445cae42e763c17d7bd8c18b854 (commit)
      from  5d1a1fdf1000a5e934e44f9b7455f1ac9ddfdce3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7db447ae43b8352a39a75868ba8a31739fe3dec3
Author:    Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Feb 2015 16:08:28 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Feb 2015 16:40:07 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=7db447ae43b8352a39a75868ba8a31739fe3dec3

Use qjsonwrapper to fix crash with QT5 while enabling compilation against QT4



commit 28849639fe48fce4e9d2f1c4c0be8c09c3de6f0c
Author:    Gary Buhrmaster <gary.buhrmaster at gmail.com> at Thu, 20 Feb 2014 17:58:10 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Feb 2015 16:40:07 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=28849639fe48fce4e9d2f1c4c0be8c09c3de6f0c

Patch for Qt5 change of KeyboardModifier type
Fixes #12070

(cherry picked from commit 6dd27d779ec31f8807c2256de26c06981b8aec4b)
Signed-off-by: Stuart Morgan <smorgan at mythtv.org>



commit 585c04077b556445cae42e763c17d7bd8c18b854
Author:    Gary Buhrmaster <gary.buhrmaster at gmail.com> at Tue, 10 Sep 2013 16:27:13 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Feb 2015 15:12:01 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=585c04077b556445cae42e763c17d7bd8c18b854

Patch for Qt5 change of QKeySequence count type
Fixes #11839

(cherry picked from commit dcc1fa914cf2614543bb274da6faa8a6db543946)
Signed-off-by: Stuart Morgan <smorgan at mythtv.org>



-----------------------------------------------------------------------

Summary of changes:
 mythtv/external/qjsonwrapper/LICENSE               |   21 +++
 mythtv/external/qjsonwrapper/README.md             |    4 +
 mythtv/external/qjsonwrapper/qjsonwrapper/Json.cpp |  148 ++++++++++++++++++++
 mythtv/external/qjsonwrapper/qjsonwrapper/Json.h   |   73 ++++++++++
 mythtv/libs/libmythbase/libmythbase.pro            |    2 +
 mythtv/libs/libmythbase/logging.cpp                |   21 +--
 mythtv/libs/libmythui/jsmenu.cpp                   |    7 +-
 mythtv/libs/libmythui/lirc.cpp                     |    8 +-
 mythtv/libs/libmythui/lircevent.h                  |    4 +
 9 files changed, 270 insertions(+), 18 deletions(-)
 create mode 100644 mythtv/external/qjsonwrapper/LICENSE
 create mode 100644 mythtv/external/qjsonwrapper/README.md
 create mode 100644 mythtv/external/qjsonwrapper/qjsonwrapper/Json.cpp
 create mode 100644 mythtv/external/qjsonwrapper/qjsonwrapper/Json.h

--