From c1e4a932fcf632ce3d8b296fa19feb128694c8df Mon Sep 17 00:00:00 2001 From: adelcastillo Date: Sun, 21 Mar 2010 12:38:36 +0000 Subject: [PATCH] Arreglado un pequeno bug. git-svn-id: https://opengnsys.es/svn/trunk@828 a21b9725-9963-47de-94b9-378ad31fedc9 --- src/main.cpp | 16 +++++----------- src/src.pro | 31 +++++++++++++++---------------- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index d1873ce..8312af2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,17 +1,11 @@ #include +#include "core.h" #include -#include "mainwindow.h" +#include 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/src/src.pro b/src/src.pro index 405f031..872180f 100644 --- a/src/src.pro +++ b/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 + +HEADERS = core.h config.h browser.h adminbrowser.h logfile.h INCLUDEPATH = ../qtermwidget/src - -#LIBS += -L.. -lqtermwidget - - -