Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixed the VdomBrowser project file
  • Loading branch information
agentzh committed Aug 21, 2009
1 parent 262ae68 commit 18e24cd
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
10 changes: 8 additions & 2 deletions VdomBrowser.pro
Expand Up @@ -26,7 +26,7 @@ HEADERS += iterator.h \
CONFIG -= app_bundle
CONFIG += qt warn_on uitools
DESTDIR = $$PWD
LIBS += -lqjson
LIBS += -lQJson

BASE_DIR = $$PWD
QT+=xml network webkit
Expand All @@ -43,6 +43,12 @@ CONFIG(release) {
}
DEFINES += BUILDING_QT__=1

isEmpty(QJSON_DIR) {
} else {
INCLUDEPATH = $$QJSON_DIR/include $$INCLUDEPATH
QMAKE_LIBDIR_FLAGS += -L$$QJSON_DIR/lib
}

CONFIG += $$(QT_WEBKIT)
webkit_trunk {
WEBKITDIR = $$(WEBKITDIR)
Expand All @@ -58,7 +64,7 @@ webkit_trunk {
message(Using WebKit Build at $$WEBKITBUILD)
QT -= webkit
DEFINES += WEBKIT_TRUNK
QMAKE_LIBDIR_FLAGS = -L$$WEBKITBUILD
QMAKE_LIBDIR_FLAGS += -L$$WEBKITBUILD
LIBS += -L$$WEBKITBUILD -lQtWebKit
INCLUDEPATH = $$WEBKITDIR/WebKit/qt/Api $$INCLUDEPATH
QMAKE_RPATHDIR = $$WEBKITBUILD $$QMAKE_RPATHDIR
Expand Down
8 changes: 4 additions & 4 deletions build.sh
@@ -1,13 +1,13 @@
#!/bin/sh

export QT_WEBKIT=webkit_trunk
export WEBKITDIR=$HOME/webkit/WebKit
#export QT_WEBKIT=webkit_trunk
export WEBKITDIR=
if [ -z "$QTDIR" ]; then
export QTDIR=/export/vdom/qt
export QTDIR=/opt/vdom/qt
fi
export PATH=$QTDIR/bin:$PATH
#make distclean
/export/vdom/qt/bin/qmake "CONFIG-=debug" -r
$QTDIR/bin/qmake "CONFIG-=debug" -r
#qmake -r
make -j2

2 changes: 1 addition & 1 deletion mainwindow.cpp
Expand Up @@ -454,7 +454,7 @@ void MainWindow::readSettings() {

m_enableJavascript = m_settings->value("enableJavascript").toBool();
m_enableParseJavascript = m_settings->value("enableParseJavascript").toBool();
QWebVDom::setEnabledParseJavascript(m_enableParseJavascript);
//QWebVDom::setEnabledParseJavascript(m_enableParseJavascript);

m_enablePlugins = m_settings->value("enablePlugins").toBool();
m_enableImages = m_settings->value("enableImages").toBool();
Expand Down
4 changes: 2 additions & 2 deletions mainwindow.h
Expand Up @@ -15,7 +15,7 @@
#include "iteratorconfigdialog.h"
#include "iterator.h"

#include <qwebselected.h>
//#include <qwebselected.h>
#include "webview.h"
#include "webpage.h"

Expand Down Expand Up @@ -194,7 +194,7 @@ protected slots:

void toggleEnableParseJavascript(bool enabled) {
m_enableParseJavascript = enabled;
QWebVDom::setEnabledParseJavascript(enabled);
//QWebVDom::setEnabledParseJavascript(enabled);
}

void toggleEnableJava(bool enabled) {
Expand Down

0 comments on commit 18e24cd

Please sign in to comment.