User:Robin Cornelius/standalone qtwebkit: Difference between revisions
Jump to navigation
Jump to search
No edit summary |
No edit summary |
||
| Line 4: | Line 4: | ||
hg clone http://hg.secondlife.com/llqtwebkit/ | hg clone http://hg.secondlife.com/llqtwebkit/ | ||
To get this to build some minor changes are required | To get this to build some minor changes are required :- | ||
diff -r d3b5f3a6f6c1 llembeddedbrowserwindow.cpp | diff -r d3b5f3a6f6c1 llembeddedbrowserwindow.cpp | ||
--- a/llembeddedbrowserwindow.cpp | --- a/llembeddedbrowserwindow.cpp Mon Sep 21 14:26:31 2009 -0700 | ||
+++ b/llembeddedbrowserwindow.cpp | +++ b/llembeddedbrowserwindow.cpp Tue Nov 03 20:50:14 2009 +0000 | ||
@@ -68,7 +68,7 @@ | @@ -68,7 +68,7 @@ | ||
#include <qdebug.h> | #include <qdebug.h> | ||
#endif | #endif | ||
-#define WEBHISTORYPATCH | -#define WEBHISTORYPATCH | ||
+//#define WEBHISTORYPATCH | +//#define WEBHISTORYPATCH | ||
LLEmbeddedBrowserWindow::LLEmbeddedBrowserWindow() | LLEmbeddedBrowserWindow::LLEmbeddedBrowserWindow() | ||
{ | { | ||
@@ - | diff -r d3b5f3a6f6c1 llnetworkaccessmanager.cpp | ||
--- a/llnetworkaccessmanager.cpp Mon Sep 21 14:26:31 2009 -0700 | |||
+++ b/llnetworkaccessmanager.cpp Tue Nov 03 20:50:14 2009 +0000 | |||
@@ -75,7 +75,7 @@ | |||
- | |||
+ | void LLNetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator) | ||
# | { | ||
- authenticator->tryAgainLater = true; | |||
+ //authenticator->tryAgainLater = true; | |||
AuthDialog authDialog; | |||
int i; | |||
for (i = 0; i < authDialogs.count(); ++i) { | |||
@@ -107,7 +107,7 @@ | |||
authDialog.authenticationDialog->deleteLater(); | |||
authDialog.authenticationDialog = 0; | |||
authDialogs.removeAt(i); | |||
- authenticator->tryAgainLater = false; | |||
+ //authenticator->tryAgainLater = false; | |||
} | |||
} | |||
diff -r d3b5f3a6f6c1 llqtwebkit.pro | |||
--- a/llqtwebkit.pro Mon Sep 21 14:26:31 2009 -0700 | |||
+++ b/llqtwebkit.pro Tue Nov 03 20:50:14 2009 +0000 | |||
@@ -1,4 +1,4 @@ | |||
-CONFIG += static | |||
+CONFIG += shared | |||
TEMPLATE = lib | |||
TARGET = | |||
DEPENDPATH += . | |||
diff -r d3b5f3a6f6c1 static.pri | |||
--- a/static.pri Mon Sep 21 14:26:31 2009 -0700 | |||
+++ b/static.pri Tue Nov 03 20:50:14 2009 +0000 | |||
@@ -1,4 +1,5 @@ | |||
unix { | |||
- DEFINES += STATIC_QT | |||
- QTPLUGIN += qgif | |||
+ #DEFINES += STATIC_QT | |||
+ #QTPLUGIN += qgif | |||
+ QMAKE_LFLAGS_SHLIB *= "--rpath=/usr/lib/qt4/plugins/imageformats" | |||
} | } | ||
Revision as of 13:06, 3 November 2009
Instructions for building the qt/webkit media plugin using distribution (shared) qt4, instead of static qt4 that the default LL build uses.
First of all you need to grab the latest code for qt/webkit this is in a mecurial (hg) repository and if you install the mecurial tools for your distribution you can then fetch the code with
hg clone http://hg.secondlife.com/llqtwebkit/
To get this to build some minor changes are required :-
diff -r d3b5f3a6f6c1 llembeddedbrowserwindow.cpp
--- a/llembeddedbrowserwindow.cpp Mon Sep 21 14:26:31 2009 -0700
+++ b/llembeddedbrowserwindow.cpp Tue Nov 03 20:50:14 2009 +0000
@@ -68,7 +68,7 @@
#include <qdebug.h>
#endif
-#define WEBHISTORYPATCH
+//#define WEBHISTORYPATCH
LLEmbeddedBrowserWindow::LLEmbeddedBrowserWindow()
{
diff -r d3b5f3a6f6c1 llnetworkaccessmanager.cpp
--- a/llnetworkaccessmanager.cpp Mon Sep 21 14:26:31 2009 -0700
+++ b/llnetworkaccessmanager.cpp Tue Nov 03 20:50:14 2009 +0000
@@ -75,7 +75,7 @@
void LLNetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator)
{
- authenticator->tryAgainLater = true;
+ //authenticator->tryAgainLater = true;
AuthDialog authDialog;
int i;
for (i = 0; i < authDialogs.count(); ++i) {
@@ -107,7 +107,7 @@
authDialog.authenticationDialog->deleteLater();
authDialog.authenticationDialog = 0;
authDialogs.removeAt(i);
- authenticator->tryAgainLater = false;
+ //authenticator->tryAgainLater = false;
}
}
diff -r d3b5f3a6f6c1 llqtwebkit.pro
--- a/llqtwebkit.pro Mon Sep 21 14:26:31 2009 -0700
+++ b/llqtwebkit.pro Tue Nov 03 20:50:14 2009 +0000
@@ -1,4 +1,4 @@
-CONFIG += static
+CONFIG += shared
TEMPLATE = lib
TARGET =
DEPENDPATH += .
diff -r d3b5f3a6f6c1 static.pri
--- a/static.pri Mon Sep 21 14:26:31 2009 -0700
+++ b/static.pri Tue Nov 03 20:50:14 2009 +0000
@@ -1,4 +1,5 @@
unix {
- DEFINES += STATIC_QT
- QTPLUGIN += qgif
+ #DEFINES += STATIC_QT
+ #QTPLUGIN += qgif
+ QMAKE_LFLAGS_SHLIB *= "--rpath=/usr/lib/qt4/plugins/imageformats"
}