summaryrefslogtreecommitdiffstats
path: root/abs/core/mythplugins/qt-4.7-buildfixes.diff
diff options
context:
space:
mode:
authorMichael Hanson <hansonorders@verizon.net>2010-11-06 03:49:34 (GMT)
committerMichael Hanson <hansonorders@verizon.net>2010-11-06 03:49:34 (GMT)
commit28df92c527607da6a77cbc2ba0f8f62bc6dff548 (patch)
treeee12dafecfaabb1b8c9f75273e11a2af8e1bfa02 /abs/core/mythplugins/qt-4.7-buildfixes.diff
parentcd93c8ee5f2f5c40d6dd56c2c45d54560b052852 (diff)
downloadlinhes_pkgbuild-28df92c527607da6a77cbc2ba0f8f62bc6dff548.zip
linhes_pkgbuild-28df92c527607da6a77cbc2ba0f8f62bc6dff548.tar.gz
linhes_pkgbuild-28df92c527607da6a77cbc2ba0f8f62bc6dff548.tar.bz2
mythplugins: update to 0.24 - untested
Diffstat (limited to 'abs/core/mythplugins/qt-4.7-buildfixes.diff')
-rw-r--r--abs/core/mythplugins/qt-4.7-buildfixes.diff26
1 files changed, 26 insertions, 0 deletions
diff --git a/abs/core/mythplugins/qt-4.7-buildfixes.diff b/abs/core/mythplugins/qt-4.7-buildfixes.diff
new file mode 100644
index 0000000..dcffebe
--- /dev/null
+++ b/abs/core/mythplugins/qt-4.7-buildfixes.diff
@@ -0,0 +1,26 @@
+Index: /branches/release-0-23-fixes/mythplugins/mythnetvision/mythnetvision/netsearch.cpp
+===================================================================
+--- /branches/release-0-23-fixes/mythplugins/mythnetvision/mythnetvision/netsearch.cpp (revision 24265)
++++ /branches/release-0-23-fixes/mythplugins/mythnetvision/mythnetvision/netsearch.cpp (revision 26391)
+@@ -45,7 +45,7 @@
+ m_progress(NULL), m_busyPopup(NULL),
+ m_okPopup(NULL), m_popupStack(),
+- m_netSearch(), m_currentSearch(NULL),
+- m_currentGrabber(0), m_currentCmd(NULL),
+- m_currentDownload(NULL), m_pagenum(0),
++ m_netSearch(), m_currentSearch(QString()),
++ m_currentGrabber(0), m_currentCmd(QString()),
++ m_currentDownload(QString()), m_pagenum(0),
+ m_lock(QMutex::Recursive)
+ {
+Index: /branches/release-0-23-fixes/mythplugins/mythvideo/mythvideo/videodlg.h
+===================================================================
+--- /branches/release-0-23-fixes/mythplugins/mythvideo/mythvideo/videodlg.h (revision 22916)
++++ /branches/release-0-23-fixes/mythplugins/mythvideo/mythvideo/videodlg.h (revision 26391)
+@@ -151,5 +151,5 @@
+ QString GetCoverImage(MythGenericTree *node);
+ QString GetFirstImage(MythGenericTree *node, QString type,
+- QString gpnode = NULL, int levels = 0);
++ QString gpnode = QString(), int levels = 0);
+ QString GetImageFromFolder(Metadata *metadata);
+ QString GetScreenshot(MythGenericTree *node);