changeset 13359:a505e220858b

Moved files, modified README.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Thu, 07 Apr 2011 12:12:13 +0200
parents d9f1bed01bd0
children 28160d541ddb
files gui//Makefile gui//Quint.pro gui//README
diffstat 3 files changed, 109 insertions(+), 107 deletions(-) [+]
line wrap: on
line diff
--- a/gui//Makefile
+++ b/gui//Makefile
@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: Quint
-# Generated by qmake (2.01a) (Qt 4.7.2) on: Do. Apr 7 11:59:45 2011
+# Generated by qmake (2.01a) (Qt 4.7.2) on: Do. Apr 7 12:08:50 2011
 # Project:  Quint.pro
 # Template: app
-# Command: /usr/bin/qmake -o Makefile Quint.pro
+# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ QMLJSDEBUGGER_PATH=/usr/share/qtcreator/qml/qmljsdebugger -o Makefile Quint.pro
 #############################################################################
 
 ####### Compiler, tools and options
@@ -39,7 +39,7 @@
 
 ####### Output directory
 
-OBJECTS_DIR   = ./
+OBJECTS_DIR   = object-files/
 
 ####### Files
 
@@ -75,39 +75,39 @@
 		moc_k3processcontroller.cpp \
 		moc_Session.cpp \
 		moc_qtermwidget.cpp
-OBJECTS       = main.o \
-		mainwindow.o \
-		terminal.o \
-		TerminalCharacterDecoder.o \
-		KeyboardTranslator.o \
-		Screen.o \
-		History.o \
-		BlockArray.o \
-		konsole_wcwidth.o \
-		ScreenWindow.o \
-		Emulation.o \
-		Vt102Emulation.o \
-		TerminalDisplay.o \
-		Filter.o \
-		Pty.o \
-		kpty.o \
-		k3process.o \
-		k3processcontroller.o \
-		Session.o \
-		ShellCommand.o \
-		qtermwidget.o \
-		moc_mainwindow.o \
-		moc_terminal.o \
-		moc_ScreenWindow.o \
-		moc_Emulation.o \
-		moc_Vt102Emulation.o \
-		moc_TerminalDisplay.o \
-		moc_Filter.o \
-		moc_Pty.o \
-		moc_k3process.o \
-		moc_k3processcontroller.o \
-		moc_Session.o \
-		moc_qtermwidget.o
+OBJECTS       = object-files/main.o \
+		object-files/mainwindow.o \
+		object-files/terminal.o \
+		object-files/TerminalCharacterDecoder.o \
+		object-files/KeyboardTranslator.o \
+		object-files/Screen.o \
+		object-files/History.o \
+		object-files/BlockArray.o \
+		object-files/konsole_wcwidth.o \
+		object-files/ScreenWindow.o \
+		object-files/Emulation.o \
+		object-files/Vt102Emulation.o \
+		object-files/TerminalDisplay.o \
+		object-files/Filter.o \
+		object-files/Pty.o \
+		object-files/kpty.o \
+		object-files/k3process.o \
+		object-files/k3processcontroller.o \
+		object-files/Session.o \
+		object-files/ShellCommand.o \
+		object-files/qtermwidget.o \
+		object-files/moc_mainwindow.o \
+		object-files/moc_terminal.o \
+		object-files/moc_ScreenWindow.o \
+		object-files/moc_Emulation.o \
+		object-files/moc_Vt102Emulation.o \
+		object-files/moc_TerminalDisplay.o \
+		object-files/moc_Filter.o \
+		object-files/moc_Pty.o \
+		object-files/moc_k3process.o \
+		object-files/moc_k3processcontroller.o \
+		object-files/moc_Session.o \
+		object-files/moc_qtermwidget.o
 DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
 		/usr/share/qt4/mkspecs/common/unix.conf \
 		/usr/share/qt4/mkspecs/common/linux.conf \
@@ -183,7 +183,7 @@
 		/usr/lib/libQtWebKit.prl \
 		/usr/lib/libQtGui.prl \
 		/usr/lib/libQtCore.prl
-	$(QMAKE) -o Makefile Quint.pro
+	$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ QMLJSDEBUGGER_PATH=/usr/share/qtcreator/qml/qmljsdebugger -o Makefile Quint.pro
 /usr/share/qt4/mkspecs/common/g++.conf:
 /usr/share/qt4/mkspecs/common/unix.conf:
 /usr/share/qt4/mkspecs/common/linux.conf:
@@ -208,11 +208,11 @@
 /usr/lib/libQtGui.prl:
 /usr/lib/libQtCore.prl:
 qmake:  FORCE
-	@$(QMAKE) -o Makefile Quint.pro
+	@$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ QMLJSDEBUGGER_PATH=/usr/share/qtcreator/qml/qmljsdebugger -o Makefile Quint.pro
 
 dist: 
-	@$(CHK_DIR_EXISTS) .tmp/Quint1.0.0 || $(MKDIR) .tmp/Quint1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Quint1.0.0/ && $(COPY_FILE) --parents mainwindow.h terminal.h 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 .tmp/Quint1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp terminal.cpp 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 .tmp/Quint1.0.0/ && (cd `dirname .tmp/Quint1.0.0` && $(TAR) Quint1.0.0.tar Quint1.0.0 && $(COMPRESS) Quint1.0.0.tar) && $(MOVE) `dirname .tmp/Quint1.0.0`/Quint1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Quint1.0.0
+	@$(CHK_DIR_EXISTS) object-files/Quint1.0.0 || $(MKDIR) object-files/Quint1.0.0 
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) object-files/Quint1.0.0/ && $(COPY_FILE) --parents mainwindow.h terminal.h 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 object-files/Quint1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp terminal.cpp 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 object-files/Quint1.0.0/ && (cd `dirname object-files/Quint1.0.0` && $(TAR) Quint1.0.0.tar Quint1.0.0 && $(COMPRESS) Quint1.0.0.tar) && $(MOVE) `dirname object-files/Quint1.0.0`/Quint1.0.0.tar.gz . && $(DEL_FILE) -r object-files/Quint1.0.0
 
 
 clean:compiler_clean 
@@ -312,57 +312,57 @@
 
 ####### Compile
 
-main.o: main.cpp mainwindow.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
+object-files/main.o: main.cpp mainwindow.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/main.o main.cpp
 
-mainwindow.o: mainwindow.cpp mainwindow.h \
+object-files/mainwindow.o: mainwindow.cpp mainwindow.h \
 		terminal.h \
 		qtermwidget.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/mainwindow.o mainwindow.cpp
 
-terminal.o: terminal.cpp terminal.h \
+object-files/terminal.o: terminal.cpp terminal.h \
 		qtermwidget.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o terminal.o terminal.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/terminal.o terminal.cpp
 
-TerminalCharacterDecoder.o: TerminalCharacterDecoder.cpp TerminalCharacterDecoder.h \
+object-files/TerminalCharacterDecoder.o: TerminalCharacterDecoder.cpp TerminalCharacterDecoder.h \
 		Character.h \
 		CharacterColor.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o TerminalCharacterDecoder.o TerminalCharacterDecoder.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/TerminalCharacterDecoder.o TerminalCharacterDecoder.cpp
 
-KeyboardTranslator.o: KeyboardTranslator.cpp KeyboardTranslator.h \
+object-files/KeyboardTranslator.o: KeyboardTranslator.cpp KeyboardTranslator.h \
 		ExtendedDefaultTranslator.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o KeyboardTranslator.o KeyboardTranslator.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/KeyboardTranslator.o KeyboardTranslator.cpp
 
-Screen.o: Screen.cpp Screen.h \
+object-files/Screen.o: Screen.cpp Screen.h \
 		Character.h \
 		CharacterColor.h \
 		History.h \
 		BlockArray.h \
 		konsole_wcwidth.h \
 		TerminalCharacterDecoder.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Screen.o Screen.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Screen.o Screen.cpp
 
-History.o: History.cpp History.h \
+object-files/History.o: History.cpp History.h \
 		BlockArray.h \
 		Character.h \
 		CharacterColor.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o History.o History.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/History.o History.cpp
 
-BlockArray.o: BlockArray.cpp BlockArray.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o BlockArray.o BlockArray.cpp
+object-files/BlockArray.o: BlockArray.cpp BlockArray.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/BlockArray.o BlockArray.cpp
 
-konsole_wcwidth.o: konsole_wcwidth.cpp konsole_wcwidth.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o konsole_wcwidth.o konsole_wcwidth.cpp
+object-files/konsole_wcwidth.o: konsole_wcwidth.cpp konsole_wcwidth.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/konsole_wcwidth.o konsole_wcwidth.cpp
 
-ScreenWindow.o: ScreenWindow.cpp ScreenWindow.h \
+object-files/ScreenWindow.o: ScreenWindow.cpp ScreenWindow.h \
 		Character.h \
 		CharacterColor.h \
 		Screen.h \
 		History.h \
 		BlockArray.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ScreenWindow.o ScreenWindow.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/ScreenWindow.o ScreenWindow.cpp
 
-Emulation.o: Emulation.cpp Emulation.h \
+object-files/Emulation.o: Emulation.cpp Emulation.h \
 		KeyboardTranslator.h \
 		Screen.h \
 		Character.h \
@@ -371,9 +371,9 @@
 		BlockArray.h \
 		TerminalCharacterDecoder.h \
 		ScreenWindow.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Emulation.o Emulation.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Emulation.o Emulation.cpp
 
-Vt102Emulation.o: Vt102Emulation.cpp Vt102Emulation.h \
+object-files/Vt102Emulation.o: Vt102Emulation.cpp Vt102Emulation.h \
 		Emulation.h \
 		Screen.h \
 		Character.h \
@@ -381,9 +381,9 @@
 		History.h \
 		BlockArray.h \
 		KeyboardTranslator.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Vt102Emulation.o Vt102Emulation.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Vt102Emulation.o Vt102Emulation.cpp
 
-TerminalDisplay.o: TerminalDisplay.cpp TerminalDisplay.h \
+object-files/TerminalDisplay.o: TerminalDisplay.cpp TerminalDisplay.h \
 		Filter.h \
 		Character.h \
 		CharacterColor.h \
@@ -392,33 +392,33 @@
 		ScreenWindow.h \
 		TerminalCharacterDecoder.h \
 		LineFont.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o TerminalDisplay.o TerminalDisplay.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/TerminalDisplay.o TerminalDisplay.cpp
 
-Filter.o: Filter.cpp Filter.h \
+object-files/Filter.o: Filter.cpp Filter.h \
 		Character.h \
 		CharacterColor.h \
 		TerminalCharacterDecoder.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Filter.o Filter.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Filter.o Filter.cpp
 
-Pty.o: Pty.cpp Pty.h \
+object-files/Pty.o: Pty.cpp Pty.h \
 		k3process.h \
 		kpty.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Pty.o Pty.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Pty.o Pty.cpp
 
-kpty.o: kpty.cpp kpty_p.h \
+object-files/kpty.o: kpty.cpp kpty_p.h \
 		kpty.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o kpty.o kpty.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/kpty.o kpty.cpp
 
-k3process.o: k3process.cpp k3process.h \
+object-files/k3process.o: k3process.cpp k3process.h \
 		k3processcontroller.h \
 		kpty.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o k3process.o k3process.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/k3process.o k3process.cpp
 
-k3processcontroller.o: k3processcontroller.cpp k3processcontroller.h \
+object-files/k3processcontroller.o: k3processcontroller.cpp k3processcontroller.h \
 		k3process.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o k3processcontroller.o k3processcontroller.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/k3processcontroller.o k3processcontroller.cpp
 
-Session.o: Session.cpp Session.h \
+object-files/Session.o: Session.cpp Session.h \
 		History.h \
 		BlockArray.h \
 		Character.h \
@@ -432,12 +432,12 @@
 		Vt102Emulation.h \
 		Emulation.h \
 		Screen.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Session.o Session.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Session.o Session.cpp
 
-ShellCommand.o: ShellCommand.cpp ShellCommand.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ShellCommand.o ShellCommand.cpp
+object-files/ShellCommand.o: ShellCommand.cpp ShellCommand.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/ShellCommand.o ShellCommand.cpp
 
-qtermwidget.o: qtermwidget.cpp qtermwidget.h \
+object-files/qtermwidget.o: qtermwidget.cpp qtermwidget.h \
 		Session.h \
 		History.h \
 		BlockArray.h \
@@ -446,43 +446,43 @@
 		TerminalDisplay.h \
 		Filter.h \
 		ColorTables.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o qtermwidget.o qtermwidget.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/qtermwidget.o qtermwidget.cpp
 
-moc_mainwindow.o: moc_mainwindow.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp
+object-files/moc_mainwindow.o: moc_mainwindow.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_mainwindow.o moc_mainwindow.cpp
 
-moc_terminal.o: moc_terminal.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_terminal.o moc_terminal.cpp
+object-files/moc_terminal.o: moc_terminal.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_terminal.o moc_terminal.cpp
 
-moc_ScreenWindow.o: moc_ScreenWindow.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_ScreenWindow.o moc_ScreenWindow.cpp
+object-files/moc_ScreenWindow.o: moc_ScreenWindow.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_ScreenWindow.o moc_ScreenWindow.cpp
 
-moc_Emulation.o: moc_Emulation.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_Emulation.o moc_Emulation.cpp
+object-files/moc_Emulation.o: moc_Emulation.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Emulation.o moc_Emulation.cpp
 
-moc_Vt102Emulation.o: moc_Vt102Emulation.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_Vt102Emulation.o moc_Vt102Emulation.cpp
+object-files/moc_Vt102Emulation.o: moc_Vt102Emulation.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Vt102Emulation.o moc_Vt102Emulation.cpp
 
-moc_TerminalDisplay.o: moc_TerminalDisplay.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_TerminalDisplay.o moc_TerminalDisplay.cpp
+object-files/moc_TerminalDisplay.o: moc_TerminalDisplay.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_TerminalDisplay.o moc_TerminalDisplay.cpp
 
-moc_Filter.o: moc_Filter.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_Filter.o moc_Filter.cpp
+object-files/moc_Filter.o: moc_Filter.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Filter.o moc_Filter.cpp
 
-moc_Pty.o: moc_Pty.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_Pty.o moc_Pty.cpp
+object-files/moc_Pty.o: moc_Pty.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Pty.o moc_Pty.cpp
 
-moc_k3process.o: moc_k3process.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_k3process.o moc_k3process.cpp
+object-files/moc_k3process.o: moc_k3process.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_k3process.o moc_k3process.cpp
 
-moc_k3processcontroller.o: moc_k3processcontroller.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_k3processcontroller.o moc_k3processcontroller.cpp
+object-files/moc_k3processcontroller.o: moc_k3processcontroller.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_k3processcontroller.o moc_k3processcontroller.cpp
 
-moc_Session.o: moc_Session.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_Session.o moc_Session.cpp
+object-files/moc_Session.o: moc_Session.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_Session.o moc_Session.cpp
 
-moc_qtermwidget.o: moc_qtermwidget.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_qtermwidget.o moc_qtermwidget.cpp
+object-files/moc_qtermwidget.o: moc_qtermwidget.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_qtermwidget.o moc_qtermwidget.cpp
 
 ####### Install
 
--- a/gui//Quint.pro
+++ b/gui//Quint.pro
@@ -5,7 +5,7 @@
 #-------------------------------------------------
 
 QT       += core gui webkit
-
+OBJECTS_DIR = object-files
 TARGET = Quint
 TEMPLATE = app
 DEFINES += HAVE_POSIX_OPENPT
--- a/gui//README
+++ b/gui//README
@@ -1,3 +1,5 @@
+Quint is using the QTermWidget to emulate a terminal, this enabling readline support for Octave. This is the original README file from the author:
+
 QTermWidget
 version 0.1.0