diff options
| author | James Meyer <james.meyer@operamail.com> | 2010-11-06 17:34:48 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2010-11-06 17:34:48 (GMT) |
| commit | a88e0a4caaee4269707417416f8e36c754ea6e16 (patch) | |
| tree | de63f290d0c85422f5c9bb8bfb3e186030f79080 /abs/core/mythplugins/qt-4.7-buildfixes.diff | |
| parent | 9b21e2c89af805f7e2e3014075318587ae479396 (diff) | |
| parent | 28df92c527607da6a77cbc2ba0f8f62bc6dff548 (diff) | |
| download | linhes_pkgbuild-a88e0a4caaee4269707417416f8e36c754ea6e16.zip linhes_pkgbuild-a88e0a4caaee4269707417416f8e36c754ea6e16.tar.gz linhes_pkgbuild-a88e0a4caaee4269707417416f8e36c754ea6e16.tar.bz2 | |
Merge branch 'testing' of ssh://linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/mythplugins/qt-4.7-buildfixes.diff')
| -rw-r--r-- | abs/core/mythplugins/qt-4.7-buildfixes.diff | 26 |
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);
|