summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pennequin <nicolas.pennequin@free.fr>2007-12-16 18:56:45 +0000
committerNicolas Pennequin <nicolas.pennequin@free.fr>2007-12-16 18:56:45 +0000
commit646d39ec4e51c2736737a5689f37256e31db2620 (patch)
tree387bd6ce0655452b10015eb2458cd21e03774ae3
parent1e16e0e1c00bc4fe044d4324bdb5eab531a9c00b (diff)
downloadrockbox-646d39ec4e51c2736737a5689f37256e31db2620.tar.gz
rockbox-646d39ec4e51c2736737a5689f37256e31db2620.zip
Accept two rbutil patches by Clemens Werther:
* FS#8336: make rbutil compile on non-windows machines * FS#8337: change target link for the "help" menu item git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15945 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--docs/CREDITS1
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp2
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro3
3 files changed, 4 insertions, 2 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index c93fcfa490..352b5507aa 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -355,6 +355,7 @@ Martin Crkovský
355Ariya Hidayat 355Ariya Hidayat
356Jonas Hurrelmann 356Jonas Hurrelmann
357Lee Kang Hyuk 357Lee Kang Hyuk
358Clemens Werther
358 359
359The libmad team 360The libmad team
360The wavpack team 361The wavpack team
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 395e538040..62a7fee4c4 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -242,7 +242,7 @@ void RbUtilQt::about()
242 242
243void RbUtilQt::help() 243void RbUtilQt::help()
244{ 244{
245 QUrl helpurl("http://www.rockbox.org/wiki/RockboxUtilityQt"); 245 QUrl helpurl("http://www.rockbox.org/wiki/RockboxUtility");
246 QDesktopServices::openUrl(helpurl); 246 QDesktopServices::openUrl(helpurl);
247} 247}
248 248
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 0277fd624a..e1a71b35f1 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -160,5 +160,6 @@ win32 {
160 system(copy ..\..\tools\sapi_voice.vbs builtin\sapi_voice.vbs) 160 system(copy ..\..\tools\sapi_voice.vbs builtin\sapi_voice.vbs)
161} 161}
162!win32 { 162!win32 {
163 system(copy ../../tools/sapi_voice.vbs builtin/sapi_voice.vbs) 163 system(mkdir builtin)
164 system(cp ../../tools/sapi_voice.vbs builtin/sapi_voice.vbs)
164} \ No newline at end of file 165} \ No newline at end of file