diff options
| author | adelcastillo <adelcastillo@us.es> | 2010-03-21 12:38:36 +0000 |
|---|---|---|
| committer | adelcastillo <adelcastillo@us.es> | 2010-03-21 12:38:36 +0000 |
| commit | d08ee588b21be690c3aa0e8bfa21daf381bb2865 (patch) | |
| tree | 545e4a38012440b4d2011b90183ec09c22211deb /client/browser | |
| parent | 33af8e45e57d0ab61252055e8401f990484cfdc6 (diff) | |
Arreglado un pequeno bug.
git-svn-id: https://opengnsys.es/svn/trunk@828 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/browser')
| -rw-r--r-- | client/browser/src/main.cpp | 16 | ||||
| -rw-r--r-- | client/browser/src/src.pro | 31 |
2 files changed, 20 insertions, 27 deletions
diff --git a/client/browser/src/main.cpp b/client/browser/src/main.cpp index d1873ce3..8312af2e 100644 --- a/client/browser/src/main.cpp +++ b/client/browser/src/main.cpp @@ -1,17 +1,11 @@ #include <QtGui/QApplication> +#include "core.h" #include <stdio.h> -#include "mainwindow.h" +#include <QDebug> int main(int argc, char *argv[]) { - if(argc<=1) - { - printf("Usage: %s http://siteweb.com/\n",argv[0]); - return -1; - } - - QApplication a(argc, argv); - MainWindow w; - w.show(); - return a.exec(); + QApplication a(argc, argv); + Core* core=new Core(); + return a.exec(); } diff --git a/client/browser/src/src.pro b/client/browser/src/src.pro index 405f0310..872180fa 100644 --- a/client/browser/src/src.pro +++ b/client/browser/src/src.pro @@ -7,23 +7,22 @@ QT += core gui webkit MOC_DIR = ../.moc -CONFIG(debug, debug|release) { - OBJECTS_DIR = ../.objs_d - TARGET = browser_d - LIBS += -L.. ../libqtermwidget_d.a -} else { - OBJECTS_DIR = ../.objs - TARGET = browser - LIBS += -L.. ../libqtermwidget.a -} +# CONFIG(debug, debug|release) { +# OBJECTS_DIR = ../.objs_d +# TARGET = browser_d +# LIBS += -L.. #../libqtermwidget_d.a +#} else { +# OBJECTS_DIR = ../.objs +# TARGET = browser +# LIBS += -L.. #../libqtermwidget.a +#} -SOURCES = main.cpp mainwindow.cpp +OBJECTS_DIR = ../.objs +TARGET = browser +LIBS += -L.. -lqtermwidget -HEADERS = mainwindow.h +SOURCES = main.cpp core.cpp config.cpp browser.cpp adminbrowser.cpp logfile.cpp -INCLUDEPATH = ../qtermwidget/src - -#LIBS += -L.. -lqtermwidget +HEADERS = core.h config.h browser.h adminbrowser.h logfile.h - - +INCLUDEPATH = ../qtermwidget/src |