Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

committed everything we have now

  • Loading branch information...
commit 53db0537101fbcaaedc3502b9ca3a918d126aaae 1 parent d264516
agentzh authored
Showing with 19 additions and 7 deletions.
  1. +13 −1 VdomBrowser.pro
  2. +2 −2 build.sh
  3. +4 −4 mainwindow.h
View
14 VdomBrowser.pro
@@ -15,12 +15,24 @@ HEADERS += aboutdialog.h \
webpage.h
CONFIG -= app_bundle
CONFIG += qt warn_on uitools
-DESTDIR = .
+DESTDIR = $$PWD
LIBS += -lqjson
+BASE_DIR = $$PWD
QT+=xml network webkit
QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+isEmpty(OUTPUT_DIR) {
+ CONFIG(release):OUTPUT_DIR=$$PWD
+ CONFIG(debug):OUTPUT_DIR=$$PWD
+}
+
+DEFINES += USE_SYSTEM_MALLOC
+CONFIG(release) {
+ DEFINES += NDEBUG
+}
+DEFINES += BUILDING_QT__=1
+
CONFIG += $$(QT_WEBKIT)
webkit_trunk {
WEBKITDIR = $$(WEBKITDIR)
View
4 build.sh
@@ -6,8 +6,8 @@ if [ -z "$QTDIR" ]; then
export QTDIR=/opt/qt4.5
fi
export PATH=$QTDIR/bin:$PATH
-make distclean
-qmake "CONFIG-=debug" -r
+#make distclean
+/opt/qt4.5/bin/qmake "CONFIG-=debug" -r
#qmake -r
make
View
8 mainwindow.h
@@ -1,10 +1,6 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
-#include "lineedit.h"
-#include "aboutdialog.h"
-#include "hunterconfigdialog.h"
-
/* from QJson: http://qjson.sourceforge.net/docs/index.html */
#include <qjson/json_driver.hh>
#include <qwebvdom.h> /* added to WebCore by Yahoo! China EEEE */
@@ -13,6 +9,10 @@
#include <qwebsettings.h>
#include <QtGui>
+#include "lineedit.h"
+#include "aboutdialog.h"
+#include "hunterconfigdialog.h"
+
class MainWindow : public QMainWindow
{
Q_OBJECT
Please sign in to comment.
Something went wrong with that request. Please try again.