Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed the VdomBrowser project file

  • Loading branch information...
commit 18e24cd9eeafcaeafe9b5af48f6d531abc0b8d36 1 parent 262ae68
agentzh authored
Showing with 15 additions and 9 deletions.
  1. +8 −2 VdomBrowser.pro
  2. +4 −4 build.sh
  3. +1 −1  mainwindow.cpp
  4. +2 −2 mainwindow.h
View
10 VdomBrowser.pro
@@ -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
@@ -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)
@@ -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
View
8 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
View
2  mainwindow.cpp
@@ -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();
View
4 mainwindow.h
@@ -15,7 +15,7 @@
#include "iteratorconfigdialog.h"
#include "iterator.h"
-#include <qwebselected.h>
+//#include <qwebselected.h>
#include "webview.h"
#include "webpage.h"
@@ -194,7 +194,7 @@ protected slots:
void toggleEnableParseJavascript(bool enabled) {
m_enableParseJavascript = enabled;
- QWebVDom::setEnabledParseJavascript(enabled);
+ //QWebVDom::setEnabledParseJavascript(enabled);
}
void toggleEnableJava(bool enabled) {
Please sign in to comment.
Something went wrong with that request. Please try again.