Cambiando a qmake de nuevo.

git-svn-id: https://opengnsys.es/svn/trunk@518 a21b9725-9963-47de-94b9-378ad31fedc9

18 files changed, 86 insertions, 13 deletions

diff --git a/client/browser/CMakeLists.txt b/client/browser/CMakeLists.txt
index c2f66778..2c595c41 100644
--- a/client/browser/CMakeLists.txt
+++ b/client/browser/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(qtermwidget/src/ ${QT_INCLUDES} ${QT_QTWEBKIT_INCLUDE_DIR})
 
 add_subdirectory(qtermwidget)
 
-set(browser_SRCS main.cpp mainwindow.cpp)
+set(browser_SRCS src/main.cpp src/mainwindow.cpp)
 
 qt4_automoc(${browser_SRCS})
 
diff --git a/client/browser/browser.pro b/client/browser/browser.pro
new file mode 100644
index 00000000..cccc63fe
--- /dev/null
+++ b/client/browser/browser.pro
@@ -0,0 +1,4 @@
+TEMPLATE 	= subdirs
+SUBDIRS 	= qtermwidget src
+
+OPTIONS 	+= ordered
diff --git a/client/browser/qtermwidget/qtermwidget.pro b/client/browser/qtermwidget/qtermwidget.pro
new file mode 100644
index 00000000..a4c19e50
--- /dev/null
+++ b/client/browser/qtermwidget/qtermwidget.pro
@@ -0,0 +1,4 @@
+TEMPLATE 	= subdirs
+SUBDIRS 	= src
+
+OPTIONS 	+= ordered
diff --git a/client/browser/qtermwidget/src/Emulation.cpp b/client/browser/qtermwidget/src/Emulation.cpp
index 6db1b29d..e767a420 100644
--- a/client/browser/qtermwidget/src/Emulation.cpp
+++ b/client/browser/qtermwidget/src/Emulation.cpp
@@ -25,7 +25,6 @@
 
 // Own
 #include "Emulation.h"
-#include "Emulation.moc"
 
 // System
 #include <assert.h>
diff --git a/client/browser/qtermwidget/src/Filter.cpp b/client/browser/qtermwidget/src/Filter.cpp
index d8d56138..b20f500b 100644
--- a/client/browser/qtermwidget/src/Filter.cpp
+++ b/client/browser/qtermwidget/src/Filter.cpp
@@ -21,7 +21,6 @@
 
 // Own
 #include "Filter.h"
-#include "Filter.moc"
 
 
 // System
diff --git a/client/browser/qtermwidget/src/Pty.cpp b/client/browser/qtermwidget/src/Pty.cpp
index 211ad46f..144e5e22 100644
--- a/client/browser/qtermwidget/src/Pty.cpp
+++ b/client/browser/qtermwidget/src/Pty.cpp
@@ -22,7 +22,6 @@
 
 // Own
 #include "Pty.h"
-#include "Pty.moc"
 
 // System
 #include <sys/types.h>
diff --git a/client/browser/qtermwidget/src/ScreenWindow.cpp b/client/browser/qtermwidget/src/ScreenWindow.cpp
index 27749344..2eb1e84e 100644
--- a/client/browser/qtermwidget/src/ScreenWindow.cpp
+++ b/client/browser/qtermwidget/src/ScreenWindow.cpp
@@ -21,7 +21,6 @@
 
 // Own
 #include "ScreenWindow.h"
-#include "ScreenWindow.moc"
 
 // Qt
 #include <QtCore>
diff --git a/client/browser/qtermwidget/src/Session.cpp b/client/browser/qtermwidget/src/Session.cpp
index 64dbdca3..c45e7a1d 100644
--- a/client/browser/qtermwidget/src/Session.cpp
+++ b/client/browser/qtermwidget/src/Session.cpp
@@ -24,7 +24,6 @@
 
 // Own
 #include "Session.h"
-#include "Session.moc"
 
 // Standard
 #include <assert.h>
diff --git a/client/browser/qtermwidget/src/TerminalDisplay.cpp b/client/browser/qtermwidget/src/TerminalDisplay.cpp
index 35463a92..e57d8de7 100644
--- a/client/browser/qtermwidget/src/TerminalDisplay.cpp
+++ b/client/browser/qtermwidget/src/TerminalDisplay.cpp
@@ -24,7 +24,6 @@
 
 // Own
 #include "TerminalDisplay.h"
-#include "TerminalDisplay.moc"
 
 // Qt
 #include <QtGui/QApplication>
diff --git a/client/browser/qtermwidget/src/Vt102Emulation.cpp b/client/browser/qtermwidget/src/Vt102Emulation.cpp
index d4a56b82..8829b3b5 100644
--- a/client/browser/qtermwidget/src/Vt102Emulation.cpp
+++ b/client/browser/qtermwidget/src/Vt102Emulation.cpp
@@ -22,7 +22,6 @@
 
 // Own
 #include "Vt102Emulation.h"
-#include "Vt102Emulation.moc"
 
 //#include <config-konsole.h>
 
diff --git a/client/browser/qtermwidget/src/k3process.cpp b/client/browser/qtermwidget/src/k3process.cpp
index ca4b8fd9..0f36a70c 100644
--- a/client/browser/qtermwidget/src/k3process.cpp
+++ b/client/browser/qtermwidget/src/k3process.cpp
@@ -22,7 +22,6 @@
 
 
 #include "k3process.h"
-#include "k3process.moc"
 //#include <config.h>
 
 #include "k3processcontroller.h"
diff --git a/client/browser/qtermwidget/src/k3processcontroller.cpp b/client/browser/qtermwidget/src/k3processcontroller.cpp
index 9e41091d..7792b6c5 100644
--- a/client/browser/qtermwidget/src/k3processcontroller.cpp
+++ b/client/browser/qtermwidget/src/k3processcontroller.cpp
@@ -20,7 +20,6 @@
 */
 
 #include "k3processcontroller.h"
-#include "k3processcontroller.moc"
 #include "k3process.h"
 
 //#include <config.h>
diff --git a/client/browser/qtermwidget/src/qtermwidget.cpp b/client/browser/qtermwidget/src/qtermwidget.cpp
index f98e5bca..ea5f92a9 100644
--- a/client/browser/qtermwidget/src/qtermwidget.cpp
+++ b/client/browser/qtermwidget/src/qtermwidget.cpp
@@ -18,7 +18,6 @@
 						
 
 #include "qtermwidget.h"
-#include "qtermwidget.moc"
 
 #include "Session.h"
 #include "TerminalDisplay.h"
diff --git a/client/browser/qtermwidget/src/src.pro b/client/browser/qtermwidget/src/src.pro
new file mode 100644
index 00000000..041b6ee0
--- /dev/null
+++ b/client/browser/qtermwidget/src/src.pro
@@ -0,0 +1,48 @@
+TEMPLATE	= lib
+VERSION		= 0.1.0
+DESTDIR 	= ../..
+
+TARGET		= qtermwidget
+
+CONFIG		+= qt debug_and_release warn_on build_all staticlib #dll
+
+QT += core gui
+
+MOC_DIR 	= ../../.moc
+
+CONFIG(debug, debug|release) {
+    OBJECTS_DIR = ../../.objs_d
+    TARGET 	= qtermwidget_d
+} else {
+    OBJECTS_DIR = ../../.objs
+    TARGET 	= qtermwidget
+}
+
+DEFINES 	+= HAVE_POSIX_OPENPT	    
+#or DEFINES 	+= HAVE_GETPT
+
+HEADERS 	= TerminalCharacterDecoder.h Character.h CharacterColor.h \
+		KeyboardTranslator.h \
+		ExtendedDefaultTranslator.h \
+		Screen.h History.h BlockArray.h konsole_wcwidth.h \
+		ScreenWindow.h \
+		Emulation.h \
+		Vt102Emulation.h TerminalDisplay.h Filter.h LineFont.h \
+		Pty.h kpty.h kpty_p.h k3process.h k3processcontroller.h \
+		Session.h ShellCommand.h \
+		qtermwidget.h
+
+SOURCES 	= TerminalCharacterDecoder.cpp \
+		KeyboardTranslator.cpp \
+		Screen.cpp History.cpp BlockArray.cpp konsole_wcwidth.cpp \
+		ScreenWindow.cpp \
+		Emulation.cpp \
+		Vt102Emulation.cpp TerminalDisplay.cpp Filter.cpp \
+		Pty.cpp kpty.cpp k3process.cpp k3processcontroller.cpp \
+		Session.cpp ShellCommand.cpp \
+		qtermwidget.cpp
+
+	    
+
+
+	
diff --git a/client/browser/main.cpp b/client/browser/src/main.cpp
index d1873ce3..d1873ce3 100644
--- a/client/browser/main.cpp
+++ b/client/browser/src/main.cpp
diff --git a/client/browser/mainwindow.cpp b/client/browser/src/mainwindow.cpp
index 86ccdae9..2dea0a23 100644
--- a/client/browser/mainwindow.cpp
+++ b/client/browser/src/mainwindow.cpp
@@ -16,8 +16,6 @@
 
 #include "qtermwidget.h"
 
-#include "mainwindow.moc"
-
 #define BUFFERSIZE 2048
 #define EXPREG_RESET "^\\[(\\d+),(\\d+)\\]\\n"
 #define EXPREG_A_PASS "^\\[(\\d+)\\]\\s"
diff --git a/client/browser/mainwindow.h b/client/browser/src/mainwindow.h
index e42e0c2b..e42e0c2b 100644
--- a/client/browser/mainwindow.h
+++ b/client/browser/src/mainwindow.h
diff --git a/client/browser/src/src.pro b/client/browser/src/src.pro
new file mode 100644
index 00000000..405f0310
--- /dev/null
+++ b/client/browser/src/src.pro
@@ -0,0 +1,29 @@
+TEMPLATE	= app
+DESTDIR 	= ..
+
+CONFIG		+= qt debug_and_release warn_on build_all static
+
+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
+}
+
+SOURCES 	= main.cpp mainwindow.cpp
+
+HEADERS = mainwindow.h
+
+INCLUDEPATH 	= ../qtermwidget/src
+
+#LIBS 		+= -L.. -lqtermwidget
+
+
+