aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Deckner <alexandre.deckner@uzzl.com>2012-07-11 22:42:54 +0200
committerAlexandre Deckner <alexandre.deckner@uzzl.com>2012-07-11 22:43:22 +0200
commit41a212d24105d1b72cbc1224cd21555ccb5b59c6 (patch)
tree72bcc4412b937552107f4552da347017a79d13fe
parent9fb13e2c1e869916ae6c29863e70e4294c9fc731 (diff)
Update haiku-webkit build package. Use new version infohrev44312
-rw-r--r--build/jam/OptionalBuildFeatures2
-rw-r--r--src/apps/webpositive/BrowserApp.cpp10
2 files changed, 9 insertions, 3 deletions
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 17bf69868d..af9d300f63 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -421,7 +421,7 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
# WebKit
-HAIKU_WEBKIT_FILE = webkit-0.1.1-x86-gcc4-2012-07-03.zip ;
+HAIKU_WEBKIT_FILE = haikuwebkit-1.1.2-x86-gcc4-2012-07-11.zip ;
if $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) < 4 {
Echo "WebKit support not available on gcc $(HAIKU_GCC_VERSION[1])" ;
diff --git a/src/apps/webpositive/BrowserApp.cpp b/src/apps/webpositive/BrowserApp.cpp
index 71e2177e42..ce0082a990 100644
--- a/src/apps/webpositive/BrowserApp.cpp
+++ b/src/apps/webpositive/BrowserApp.cpp
@@ -35,6 +35,7 @@
#include "SettingsWindow.h"
#include "svn_revision.h"
#include "NetworkCookieJar.h"
+#include "WebKitInfo.h"
#include "WebPage.h"
#include "WebSettings.h"
#include "WebView.h"
@@ -86,8 +87,13 @@ void
BrowserApp::AboutRequested()
{
BString aboutText("WebPositive\n\nby Ryan Leavengood, Andrea Anzani, "
- "Maxime Simon, Michael Lotz, Rene Gollent and Stephan Aßmus");
- aboutText << "\n\nSVN revision: " << kSVNRevision;
+ "Maxime Simon, Michael Lotz, Rene Gollent, Stephan Aßmus and "
+ "Alexandre Deckner");
+ aboutText << "\n\nWebPositive 1.1";
+ aboutText << "\n\nHaikuWebKit " << WebKitInfo::HaikuWebKitVersion();
+ aboutText << " (" << WebKitInfo::HaikuWebKitRevision() << ")";
+ aboutText << "\nWebKit " << WebKitInfo::WebKitVersion();
+ aboutText << " (" << WebKitInfo::WebKitRevision() << ")";
BAlert* alert = new BAlert("About WebPositive", aboutText.String(),
"Sweet!");