From 39e919c5b915934a81a1fa5143df813d3dda801b Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 25 Jan 2011 17:16:40 +0100 Subject: updated --- .gitignore | 1 + fbbrowser/.cproject | 141 -------------- fbbrowser/.project | 88 --------- fbbrowser/Makefile.Debug | 179 ------------------ fbbrowser/Makefile.Release | 179 ------------------ fbbrowser/debug/fbbrowser.o | Bin 229592 -> 0 bytes fbbrowser/debug/main.o | Bin 296420 -> 0 bytes fbbrowser/debug/moc_fbbrowser.cpp | 69 ------- fbbrowser/debug/moc_fbbrowser.o | Bin 237684 -> 0 bytes fbbrowser/fbbrowser.cpp | 89 --------- fbbrowser/fbbrowser.h | 40 ---- fbbrowser/fbbrowser.ui | 19 -- fbbrowser/fbgui.cpp | 83 -------- fbbrowser/fbgui.h | 28 --- fbbrowser/fbgui.pro | 12 -- fbbrowser/fbgui.qrc | 5 - fbbrowser/html/errorPage.html | 32 ---- fbbrowser/testApp.sh | 22 --- src/.cproject | 141 ++++++++++++++ src/.project | 88 +++++++++ src/Makefile.Debug | 179 ++++++++++++++++++ src/Makefile.Release | 179 ++++++++++++++++++ src/debug/fbbrowser.o | Bin 0 -> 229592 bytes src/debug/main.o | Bin 0 -> 296420 bytes src/debug/moc_fbbrowser.cpp | 69 +++++++ src/debug/moc_fbbrowser.o | Bin 0 -> 237684 bytes src/fbbrowser.cpp | 89 +++++++++ src/fbbrowser.h | 40 ++++ src/fbbrowser.ui | 19 ++ src/fbgui.cpp | 83 ++++++++ src/fbgui.h | 28 +++ src/fbgui.pro | 12 ++ src/fbgui.qrc | 5 + src/html/errorPage.html | 32 ++++ src/testApp.sh | 22 +++ webkitTest/.cproject | 140 -------------- webkitTest/.metadata/.lock | 0 webkitTest/.metadata/.log | 13 -- webkitTest/.metadata/.mylyn/repositories.xml.zip | Bin 421 -> 0 bytes .../.metadata/.plugins/org.eclipse.cdt.core/.log | 1 - .../.plugins/org.eclipse.cdt.make.core/specs.c | 1 - .../.plugins/org.eclipse.cdt.make.core/specs.cpp | 1 - .../.root/.indexes/history.version | 1 - .../.root/.indexes/properties.index | Bin 57 -> 0 bytes .../.root/.indexes/properties.version | 1 - .../org.eclipse.core.resources/.root/1.tree | Bin 148 -> 0 bytes .../.safetable/org.eclipse.core.resources | Bin 534 -> 0 bytes .../.settings/org.eclipse.cdt.ui.prefs | 5 - .../.settings/org.eclipse.core.resources.prefs | 3 - .../org.eclipse.epp.usagedata.recording.prefs | 3 - .../.settings/org.eclipse.jdt.ui.prefs | 15 -- .../.settings/org.eclipse.mylyn.context.core.prefs | 3 - .../.settings/org.eclipse.mylyn.monitor.ui.prefs | 3 - .../.settings/org.eclipse.team.cvs.ui.prefs | 3 - .../.settings/org.eclipse.team.ui.prefs | 3 - .../.settings/org.eclipse.ui.ide.prefs | 6 - .../.settings/org.eclipse.ui.prefs | 3 - .../.settings/org.eclipse.ui.workbench.prefs | 3 - .../usagedata.csv | 126 ------------- .../org.eclipse.jdt.core/nonChainingJarsCache | Bin 4 -> 0 bytes .../variablesAndContainers.dat | Bin 58 -> 0 bytes .../org.eclipse.jdt.ui/OpenTypeHistory.xml | 2 - .../QualifiedTypeNameHistory.xml | 2 - .../org.eclipse.ui.intro/dialog_settings.xml | 4 - .../org.eclipse.ui.workbench/dialog_settings.xml | 3 - .../org.eclipse.ui.workbench/workbench.xml | 209 --------------------- .../org.eclipse.ui.workbench/workingsets.xml | 4 - webkitTest/.metadata/version.ini | 1 - webkitTest/.project | 88 --------- webkitTest/Makefile.Debug | 179 ------------------ webkitTest/Makefile.Release | 179 ------------------ webkitTest/README | 4 - webkitTest/debug/main.o | Bin 296436 -> 0 bytes webkitTest/debug/moc_webkittest.cpp | 69 ------- webkitTest/debug/moc_webkittest.o | Bin 237756 -> 0 bytes webkitTest/debug/webkittest.o | Bin 229644 -> 0 bytes webkitTest/files | 13 -- webkitTest/main.cpp | 22 --- webkitTest/out.txt | 1 - webkitTest/tar | 0 webkitTest/test.sh | 10 - webkitTest/webkitTest | Bin 25740 -> 0 bytes webkitTest/webkitTest.pro | 10 - webkitTest/webkittest.cpp | 58 ------ webkitTest/webkittest.h | 27 --- webkitTest/webkittest.ui | 42 ----- 86 files changed, 987 insertions(+), 2247 deletions(-) delete mode 100644 fbbrowser/.cproject delete mode 100644 fbbrowser/.project delete mode 100644 fbbrowser/Makefile.Debug delete mode 100644 fbbrowser/Makefile.Release delete mode 100644 fbbrowser/debug/fbbrowser.o delete mode 100644 fbbrowser/debug/main.o delete mode 100644 fbbrowser/debug/moc_fbbrowser.cpp delete mode 100644 fbbrowser/debug/moc_fbbrowser.o delete mode 100644 fbbrowser/fbbrowser.cpp delete mode 100644 fbbrowser/fbbrowser.h delete mode 100644 fbbrowser/fbbrowser.ui delete mode 100644 fbbrowser/fbgui.cpp delete mode 100644 fbbrowser/fbgui.h delete mode 100644 fbbrowser/fbgui.pro delete mode 100644 fbbrowser/fbgui.qrc delete mode 100644 fbbrowser/html/errorPage.html delete mode 100755 fbbrowser/testApp.sh create mode 100644 src/.cproject create mode 100644 src/.project create mode 100644 src/Makefile.Debug create mode 100644 src/Makefile.Release create mode 100644 src/debug/fbbrowser.o create mode 100644 src/debug/main.o create mode 100644 src/debug/moc_fbbrowser.cpp create mode 100644 src/debug/moc_fbbrowser.o create mode 100644 src/fbbrowser.cpp create mode 100644 src/fbbrowser.h create mode 100644 src/fbbrowser.ui create mode 100644 src/fbgui.cpp create mode 100644 src/fbgui.h create mode 100644 src/fbgui.pro create mode 100644 src/fbgui.qrc create mode 100644 src/html/errorPage.html create mode 100755 src/testApp.sh delete mode 100644 webkitTest/.cproject delete mode 100644 webkitTest/.metadata/.lock delete mode 100644 webkitTest/.metadata/.log delete mode 100644 webkitTest/.metadata/.mylyn/repositories.xml.zip delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.cdt.core/.log delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.cdt.make.core/specs.c delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.cdt.make.core/specs.cpp delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.ui.prefs delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.recording.prefs delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.ui.intro/dialog_settings.xml delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml delete mode 100644 webkitTest/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml delete mode 100644 webkitTest/.metadata/version.ini delete mode 100644 webkitTest/.project delete mode 100644 webkitTest/Makefile.Debug delete mode 100644 webkitTest/Makefile.Release delete mode 100644 webkitTest/README delete mode 100644 webkitTest/debug/main.o delete mode 100644 webkitTest/debug/moc_webkittest.cpp delete mode 100644 webkitTest/debug/moc_webkittest.o delete mode 100644 webkitTest/debug/webkittest.o delete mode 100644 webkitTest/files delete mode 100644 webkitTest/main.cpp delete mode 100644 webkitTest/out.txt delete mode 100644 webkitTest/tar delete mode 100755 webkitTest/test.sh delete mode 100755 webkitTest/webkitTest delete mode 100644 webkitTest/webkitTest.pro delete mode 100644 webkitTest/webkittest.cpp delete mode 100644 webkitTest/webkittest.h delete mode 100644 webkitTest/webkittest.ui diff --git a/.gitignore b/.gitignore index 720432c..cf263a2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ moc_*.* ui_*.* qrc_*.* +*.swp .project .cproject .metadata diff --git a/fbbrowser/.cproject b/fbbrowser/.cproject deleted file mode 100644 index 08a2b7b..0000000 --- a/fbbrowser/.cproject +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - make - - release - false - false - true - - - make - - debug - false - false - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fbbrowser/.project b/fbbrowser/.project deleted file mode 100644 index 477155b..0000000 --- a/fbbrowser/.project +++ /dev/null @@ -1,88 +0,0 @@ - - - fbbrowser - - - - - - com.trolltech.qtcppproject.QtMakefileGenerator - - - - - org.eclipse.cdt.make.core.makeBuilder - clean,full,incremental, - - - org.eclipse.cdt.core.errorOutputParser - org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.MakeErrorParser; - - - org.eclipse.cdt.make.core.append_environment - true - - - org.eclipse.cdt.make.core.build.arguments - - - - org.eclipse.cdt.make.core.build.command - make - - - org.eclipse.cdt.make.core.build.target.auto - debug - - - org.eclipse.cdt.make.core.build.target.clean - clean - - - org.eclipse.cdt.make.core.build.target.inc - debug - - - org.eclipse.cdt.make.core.enableAutoBuild - false - - - org.eclipse.cdt.make.core.enableCleanBuild - true - - - org.eclipse.cdt.make.core.enableFullBuild - true - - - org.eclipse.cdt.make.core.enabledIncrementalBuild - true - - - org.eclipse.cdt.make.core.environment - PATH=/usr/local/Trolltech/QtEmbedded-4.7.1/bin:${env_var:PATH}:${env_var:PATH}| - - - org.eclipse.cdt.make.core.stopOnError - false - - - org.eclipse.cdt.make.core.useDefaultBuildCmd - false - - - - - org.eclipse.cdt.make.core.ScannerConfigBuilder - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.make.core.makeNature - org.eclipse.cdt.make.core.ScannerConfigNature - com.trolltech.qtcppproject.QtNature - - diff --git a/fbbrowser/Makefile.Debug b/fbbrowser/Makefile.Debug deleted file mode 100644 index 6758861..0000000 --- a/fbbrowser/Makefile.Debug +++ /dev/null @@ -1,179 +0,0 @@ -############################################################################# -# Makefile for building: fbbrowser -# Generated by qmake (2.01a) (Qt 4.7.1) on: Wed Jan 12 12:12:05 2011 -# Project: fbbrowser.pro -# Template: app -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qws/linux-x86-g++ -I. -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtCore -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtNetwork -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtGui -I/usr/local/Trolltech/QtEmbedded-4.7.1/include -Idebug -I. -LINK = g++ -LFLAGS = -Wl,-rpath,/usr/local/Trolltech/QtEmbedded-4.7.1/lib -LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtNetwork -lQtCore -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/local/Trolltech/QtEmbedded-4.7.1/bin/qmake -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = debug/ - -####### Files - -SOURCES = main.cpp \ - fbbrowser.cpp debug/moc_fbbrowser.cpp -OBJECTS = debug/main.o \ - debug/fbbrowser.o \ - debug/moc_fbbrowser.o -DIST = /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/g++.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/unix.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/linux.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/qws.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qconfig.pri \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/modules/qt_webkit_version.pri \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt_functions.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt_config.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/exclusive_builds.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_pre.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/debug.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/debug_and_release.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_post.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/build_pass.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/warn_on.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/unix/thread.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/moc.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/resources.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/uic.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/yacc.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/lex.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/include_source_dir.prf \ - fbbrowser.pro -QMAKE_TARGET = fbbrowser -DESTDIR = -TARGET = fbbrowser - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: Makefile.Debug $(TARGET) - -$(TARGET): ui_fbbrowser.h $(OBJECTS) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -qmake: FORCE - @$(QMAKE) CONFIG+=debug_and_release -o Makefile.Debug fbbrowser.pro - -dist: - @$(CHK_DIR_EXISTS) debug/fbbrowser1.0.0 || $(MKDIR) debug/fbbrowser1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/fbbrowser1.0.0/ && $(COPY_FILE) --parents fbbrowser.h debug/fbbrowser1.0.0/ && $(COPY_FILE) --parents main.cpp fbbrowser.cpp debug/fbbrowser1.0.0/ && $(COPY_FILE) --parents fbbrowser.ui debug/fbbrowser1.0.0/ && (cd `dirname debug/fbbrowser1.0.0` && $(TAR) fbbrowser1.0.0.tar fbbrowser1.0.0 && $(COMPRESS) fbbrowser1.0.0.tar) && $(MOVE) `dirname debug/fbbrowser1.0.0`/fbbrowser1.0.0.tar.gz . && $(DEL_FILE) -r debug/fbbrowser1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile.Debug - - -check: first - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -compiler_moc_header_make_all: debug/moc_fbbrowser.cpp -compiler_moc_header_clean: - -$(DEL_FILE) debug/moc_fbbrowser.cpp -debug/moc_fbbrowser.cpp: ui_fbbrowser.h \ - fbbrowser.h - /usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) fbbrowser.h -o debug/moc_fbbrowser.cpp - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: ui_fbbrowser.h -compiler_uic_clean: - -$(DEL_FILE) ui_fbbrowser.h -ui_fbbrowser.h: fbbrowser.ui - /usr/local/Trolltech/QtEmbedded-4.7.1/bin/uic fbbrowser.ui -o ui_fbbrowser.h - -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_moc_header_clean compiler_uic_clean - -####### Compile - -debug/main.o: main.cpp fbbrowser.h \ - ui_fbbrowser.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/main.o main.cpp - -debug/fbbrowser.o: fbbrowser.cpp fbbrowser.h \ - ui_fbbrowser.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/fbbrowser.o fbbrowser.cpp - -debug/moc_fbbrowser.o: debug/moc_fbbrowser.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_fbbrowser.o debug/moc_fbbrowser.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/fbbrowser/Makefile.Release b/fbbrowser/Makefile.Release deleted file mode 100644 index cbe28a3..0000000 --- a/fbbrowser/Makefile.Release +++ /dev/null @@ -1,179 +0,0 @@ -############################################################################# -# Makefile for building: fbbrowser -# Generated by qmake (2.01a) (Qt 4.7.1) on: Wed Jan 12 12:12:05 2011 -# Project: fbbrowser.pro -# Template: app -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qws/linux-x86-g++ -I. -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtCore -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtNetwork -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtGui -I/usr/local/Trolltech/QtEmbedded-4.7.1/include -Irelease -I. -LINK = g++ -LFLAGS = -Wl,-O1 -Wl,-rpath,/usr/local/Trolltech/QtEmbedded-4.7.1/lib -LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtNetwork -lQtCore -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/local/Trolltech/QtEmbedded-4.7.1/bin/qmake -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = release/ - -####### Files - -SOURCES = main.cpp \ - fbbrowser.cpp release/moc_fbbrowser.cpp -OBJECTS = release/main.o \ - release/fbbrowser.o \ - release/moc_fbbrowser.o -DIST = /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/g++.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/unix.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/linux.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/qws.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qconfig.pri \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/modules/qt_webkit_version.pri \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt_functions.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt_config.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/exclusive_builds.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_pre.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/release.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/debug_and_release.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_post.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/build_pass.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/warn_on.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/unix/thread.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/moc.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/resources.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/uic.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/yacc.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/lex.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/include_source_dir.prf \ - fbbrowser.pro -QMAKE_TARGET = fbbrowser -DESTDIR = -TARGET = fbbrowser - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: Makefile.Release $(TARGET) - -$(TARGET): ui_fbbrowser.h $(OBJECTS) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -qmake: FORCE - @$(QMAKE) CONFIG+=debug_and_release -o Makefile.Release fbbrowser.pro - -dist: - @$(CHK_DIR_EXISTS) release/fbbrowser1.0.0 || $(MKDIR) release/fbbrowser1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) release/fbbrowser1.0.0/ && $(COPY_FILE) --parents fbbrowser.h release/fbbrowser1.0.0/ && $(COPY_FILE) --parents main.cpp fbbrowser.cpp release/fbbrowser1.0.0/ && $(COPY_FILE) --parents fbbrowser.ui release/fbbrowser1.0.0/ && (cd `dirname release/fbbrowser1.0.0` && $(TAR) fbbrowser1.0.0.tar fbbrowser1.0.0 && $(COMPRESS) fbbrowser1.0.0.tar) && $(MOVE) `dirname release/fbbrowser1.0.0`/fbbrowser1.0.0.tar.gz . && $(DEL_FILE) -r release/fbbrowser1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile.Release - - -check: first - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -compiler_moc_header_make_all: release/moc_fbbrowser.cpp -compiler_moc_header_clean: - -$(DEL_FILE) release/moc_fbbrowser.cpp -release/moc_fbbrowser.cpp: ui_fbbrowser.h \ - fbbrowser.h - /usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) fbbrowser.h -o release/moc_fbbrowser.cpp - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: ui_fbbrowser.h -compiler_uic_clean: - -$(DEL_FILE) ui_fbbrowser.h -ui_fbbrowser.h: fbbrowser.ui - /usr/local/Trolltech/QtEmbedded-4.7.1/bin/uic fbbrowser.ui -o ui_fbbrowser.h - -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_moc_header_clean compiler_uic_clean - -####### Compile - -release/main.o: main.cpp fbbrowser.h \ - ui_fbbrowser.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/main.o main.cpp - -release/fbbrowser.o: fbbrowser.cpp fbbrowser.h \ - ui_fbbrowser.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/fbbrowser.o fbbrowser.cpp - -release/moc_fbbrowser.o: release/moc_fbbrowser.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_fbbrowser.o release/moc_fbbrowser.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/fbbrowser/debug/fbbrowser.o b/fbbrowser/debug/fbbrowser.o deleted file mode 100644 index 82acc90..0000000 Binary files a/fbbrowser/debug/fbbrowser.o and /dev/null differ diff --git a/fbbrowser/debug/main.o b/fbbrowser/debug/main.o deleted file mode 100644 index dd2b6c9..0000000 Binary files a/fbbrowser/debug/main.o and /dev/null differ diff --git a/fbbrowser/debug/moc_fbbrowser.cpp b/fbbrowser/debug/moc_fbbrowser.cpp deleted file mode 100644 index 0282b32..0000000 --- a/fbbrowser/debug/moc_fbbrowser.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'fbbrowser.h' -** -** Created: Wed Jan 12 12:12:08 2011 -** by: The Qt Meta Object Compiler version 62 (Qt 4.7.1) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "../fbbrowser.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'fbbrowser.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 62 -#error "This file was generated using the moc from 4.7.1. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_fbbrowser[] = { - - // content: - 5, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_fbbrowser[] = { - "fbbrowser\0" -}; - -const QMetaObject fbbrowser::staticMetaObject = { - { &QWidget::staticMetaObject, qt_meta_stringdata_fbbrowser, - qt_meta_data_fbbrowser, 0 } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &fbbrowser::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *fbbrowser::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *fbbrowser::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_fbbrowser)) - return static_cast(const_cast< fbbrowser*>(this)); - return QWidget::qt_metacast(_clname); -} - -int fbbrowser::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QWidget::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/fbbrowser/debug/moc_fbbrowser.o b/fbbrowser/debug/moc_fbbrowser.o deleted file mode 100644 index 55373e8..0000000 Binary files a/fbbrowser/debug/moc_fbbrowser.o and /dev/null differ diff --git a/fbbrowser/fbbrowser.cpp b/fbbrowser/fbbrowser.cpp deleted file mode 100644 index 50fc86a..0000000 --- a/fbbrowser/fbbrowser.cpp +++ /dev/null @@ -1,89 +0,0 @@ -#include "fbbrowser.h" -#include -#include -#include - -void fbbrowser::httpReadyRead() -{ - // This slot listens to readyRead() signal from our QNetworkReply. - qDebug() << "readyRead() signal emmited!" << endl; - if(reply->error() == QNetworkReply::NoError) - { - qDebug() << "No error, loading given URL..."; - view->load(url); - } -} - -fbbrowser::fbbrowser(const QUrl & url) -{ - view = new QWebView(this); - - // Create QNetworkAccessManager which is needed to send/receive requests. - manager = new QNetworkAccessManager(this); - // Create a QNetworkRequest object and set its URL. - // QNetworkRequest request; - request.setUrl(url); - - // Check Internet connection - // Let the manager send the request and receive the reply. - // QNetworkReply *reply = manager->get(request); - *reply = manager->get(request); - connect(reply, SIGNAL(readyRead()), this, SLOT(httpReadyRead())); - //connect(reply, SIGNAL(finished()), this, SLOT()); - - // Check if the reply is an error message. - qDebug() << "QNetworkReply error code: " << reply->error(); - - // TODO: error differentiation - // reply->error() returns 0 even for invalid URL. - // A possibility to check for validity, is to listen to readyRead() - // signal, haven't found a better way yet ... - //if(reply->error() == QNetworkReply::NoError) - //{ - // qDebug() << "No error, loading given URL..."; - // view->load(url); - //} - //else - //{ - // qDebug() << "Error occured, loading error page..."; - // view->load(QUrl("qrc:/html/errorPage.html")); - //} - - //remove the window decoration - this->setWindowFlags(Qt::SplashScreen); - - //enable JavaScript access to qt objects - QObject::connect(view->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(addJSObject())); - - //set form to fullscreen - this->showFullScreen(); - - setCentralWidget(view); -} - -// Destructor -fbbrowser::~fbbrowser() -{ -} - -// -void fbbrowser::addJSObject() -{ - view->page()->mainFrame()->addToJavaScriptWindowObject(QString("webkitTest"), this); -} - -void fbbrowser::writeText(QString text) -{ - QFile file("out.txt"); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) - return; - - QTextStream out(&file); - out << text << "\n"; -} - -// This function needed now ? -void fbbrowser::quitAll() -{ - //emit lastWindowClosed(); -} diff --git a/fbbrowser/fbbrowser.h b/fbbrowser/fbbrowser.h deleted file mode 100644 index c869197..0000000 --- a/fbbrowser/fbbrowser.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef FBBROWSER_H -#define FBBROWSER_H - -#include -#include "ui_fbbrowser.h" -#include - -class QWebView; -//QT_BEGIN_NAMESPACE -//class QLineEdit; -//QT_END_NAMESPACE - -class fbbrowser : public QMainWindow -{ - Q_OBJECT - -public: - fbbrowser(const QUrl& url); - ~fbbrowser(); - void printusage(); - Q_INVOKABLE void writeText(QString text); //used for writing web content into a file - Q_INVOKABLE void quitAll(); - -private: - QUrl url; - QNetworkRequest request; - QNetworkReply *reply; - QWebView * view; - QNetworkAccessManager * manager; - //QApplication * app(int & argc, char ** argv); - -private slots: - void httpReadyRead(); - void addJSObject(); - -signals: - void signalQuitAll(); -}; - -#endif // FBBROWSER_H diff --git a/fbbrowser/fbbrowser.ui b/fbbrowser/fbbrowser.ui deleted file mode 100644 index a02b1ab..0000000 --- a/fbbrowser/fbbrowser.ui +++ /dev/null @@ -1,19 +0,0 @@ - - fbbrowserClass - - - - 0 - 0 - 400 - 300 - - - - fbbrowser - - - - - - diff --git a/fbbrowser/fbgui.cpp b/fbbrowser/fbgui.cpp deleted file mode 100644 index fe67b79..0000000 --- a/fbbrowser/fbgui.cpp +++ /dev/null @@ -1,83 +0,0 @@ -#include "fbbrowser.h" - -#include -#include -#include -#include -#include - - -void printUsage() -{ - // Prints usage information, incomplete. - // Q: How is the -qws option handled, mention it here or not? - QTextStream qout(stdout); - qout << QObject::tr("Usage: ./fbgui [OPTIONS] ") << endl; - qout << QObject::tr("Options:") << endl; - qout << "-h or --help " << QObject::tr("Prints usage information.") << endl; - qout << "-qws " << QObject::tr("Set this application to also be the server application.") << endl; - qout << " " << QObject::tr("Skip this option if you have a QT server application") << endl; - exit(1); -} - -QString getPath(const char* c) -{ - QString appPath = c; - // Locate last '/' in the full path and remove all the chars after it. - appPath.chop(appPath.length() - 1 - - appPath.lastIndexOf("/", appPath.length()-1)); - qDebug() << "Application path: " << appPath; - return appPath; -} - -int main(int argc, char *argv[]) -{ - // Parse command line arguments. - int opt = 0; - int longIndex = 0; - // Declare the short options as a char*, these have exactly one - followed by letter from optString. - // For example: ./fbbrowser -h - // Declare the long options in the const struct, these have two - followed by a string found in longOpts[]. - // Same as: ./fbbrowser --help - // Note: I included 'qws' here to not have errors, when setting fbbrowser to be the server app aswell. - static const char *optString = "hqws"; - static const struct option longOpts[] = - { - // If an option requires parameters, write this number instead of no_argument. - // The last argument, is the corresponding char to the option string. - {"help", no_argument, NULL, 'h'} - }; - // getopt_long returns the index of the next argument to be read, -1 if there are no more arguments. - opt = getopt_long(argc, argv, optString, longOpts, &longIndex); - while (opt != -1) - { - switch(opt) - { - case 'h': - printUsage(); - break; - } - opt = getopt_long(argc, argv, optString, longOpts, &longIndex); - } - // This is the main object of a QT Application. - QApplication a(argc, argv); - // Is this really needed, since we kill the app through the fbbrowser object? - QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); - // Get the application path. - QString appPath = getPath(argv[0]); - // This part reads the URL to load from the arguments given through the commandline. - QUrl url; - if (argc > 1) - url = QUrl(argv[1]); - else //Default URL to load - url = QUrl("http://132.230.4.3/webkitTest.html"); - // Create a new Framebuffer-Browser object for displaying the given URL. - fbbrowser *fbb = new fbbrowser(url); - // Listen to the signalQuitAll() Signal to kill the app from within the browser. - QObject::connect(fbb, SIGNAL(signalQuitAll()), &a, SLOT(quit())); - // Display the browser. - fbb->show(); - - // Exit the application. - return a.exec(); -} diff --git a/fbbrowser/fbgui.h b/fbbrowser/fbgui.h deleted file mode 100644 index c65a31f..0000000 --- a/fbbrowser/fbgui.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef FBGUI_H -#define FBGUI_H - -#include - - -//QT_BEGIN_NAMESPACE -//QT_END_NAMESPACE - -class fbgui : public QMainWindow -{ - Q_OBJECT - -public: - fbgui(); - ~fbgui(); - void printUsage(); - QString getPath(const char* c); - -//private: - -//private slots: - -//signals: - -}; - -#endif // FBGUI_H diff --git a/fbbrowser/fbgui.pro b/fbbrowser/fbgui.pro deleted file mode 100644 index c1bcf82..0000000 --- a/fbbrowser/fbgui.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app -TARGET = fbgui -CONFIG += qt debug -QT += core \ - gui \ - webkit \ - network -HEADERS += fbbrowser.h -SOURCES += fbgui.cpp \ - fbbrowser.cpp -FORMS += fbbrowser.ui -RESOURCES += fbgui.qrc diff --git a/fbbrowser/fbgui.qrc b/fbbrowser/fbgui.qrc deleted file mode 100644 index da051a4..0000000 --- a/fbbrowser/fbgui.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - html/errorPage.html - - diff --git a/fbbrowser/html/errorPage.html b/fbbrowser/html/errorPage.html deleted file mode 100644 index 271d9fe..0000000 --- a/fbbrowser/html/errorPage.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - -

ERROR

- -

-No Internet Connection or Server is down. - - -Please contact your Administrator. -

- -
-

- -

-
- - - diff --git a/fbbrowser/testApp.sh b/fbbrowser/testApp.sh deleted file mode 100755 index 0995695..0000000 --- a/fbbrowser/testApp.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# This script now needs to have the URL to load as an argument. -if [ $# = 0 ]; then - echo "No URL passed, exiting..." - exit -fi -# Start QT's virtual framebuffer -/usr/local/Trolltech/Qt-4.7.1/bin/qvfb -width 800 -height 600 & -# Wait for it to load (needed?) -sleep 1 -# Start the fbbrowser app. -# This requires the fbgui git repository to be in the user's home directory. -export PATH=~/fbgui/fbbrowser/:$PATH -fbgui -qws $1 -# Check if fbbrowser is not running, if so kill the qvfb. -if [ $(ps aux | grep -v grep | grep -c fbgui) -eq 1 ] -then - echo "fbgui is still running ..." -else - echo "fbgui stopped running, killing qvfb ..." - killall qvfb -fi diff --git a/src/.cproject b/src/.cproject new file mode 100644 index 0000000..08a2b7b --- /dev/null +++ b/src/.cproject @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + make + + release + false + false + true + + + make + + debug + false + false + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/.project b/src/.project new file mode 100644 index 0000000..477155b --- /dev/null +++ b/src/.project @@ -0,0 +1,88 @@ + + + fbbrowser + + + + + + com.trolltech.qtcppproject.QtMakefileGenerator + + + + + org.eclipse.cdt.make.core.makeBuilder + clean,full,incremental, + + + org.eclipse.cdt.core.errorOutputParser + org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.MakeErrorParser; + + + org.eclipse.cdt.make.core.append_environment + true + + + org.eclipse.cdt.make.core.build.arguments + + + + org.eclipse.cdt.make.core.build.command + make + + + org.eclipse.cdt.make.core.build.target.auto + debug + + + org.eclipse.cdt.make.core.build.target.clean + clean + + + org.eclipse.cdt.make.core.build.target.inc + debug + + + org.eclipse.cdt.make.core.enableAutoBuild + false + + + org.eclipse.cdt.make.core.enableCleanBuild + true + + + org.eclipse.cdt.make.core.enableFullBuild + true + + + org.eclipse.cdt.make.core.enabledIncrementalBuild + true + + + org.eclipse.cdt.make.core.environment + PATH=/usr/local/Trolltech/QtEmbedded-4.7.1/bin:${env_var:PATH}:${env_var:PATH}| + + + org.eclipse.cdt.make.core.stopOnError + false + + + org.eclipse.cdt.make.core.useDefaultBuildCmd + false + + + + + org.eclipse.cdt.make.core.ScannerConfigBuilder + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.make.core.makeNature + org.eclipse.cdt.make.core.ScannerConfigNature + com.trolltech.qtcppproject.QtNature + + diff --git a/src/Makefile.Debug b/src/Makefile.Debug new file mode 100644 index 0000000..6758861 --- /dev/null +++ b/src/Makefile.Debug @@ -0,0 +1,179 @@ +############################################################################# +# Makefile for building: fbbrowser +# Generated by qmake (2.01a) (Qt 4.7.1) on: Wed Jan 12 12:12:05 2011 +# Project: fbbrowser.pro +# Template: app +############################################################################# + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) +INCPATH = -I/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qws/linux-x86-g++ -I. -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtCore -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtNetwork -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtGui -I/usr/local/Trolltech/QtEmbedded-4.7.1/include -Idebug -I. +LINK = g++ +LFLAGS = -Wl,-rpath,/usr/local/Trolltech/QtEmbedded-4.7.1/lib +LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtNetwork -lQtCore -lpthread +AR = ar cqs +RANLIB = +QMAKE = /usr/local/Trolltech/QtEmbedded-4.7.1/bin/qmake +TAR = tar -cf +COMPRESS = gzip -9f +COPY = cp -f +SED = sed +COPY_FILE = $(COPY) +COPY_DIR = $(COPY) -r +STRIP = strip +INSTALL_FILE = install -m 644 -p +INSTALL_DIR = $(COPY_DIR) +INSTALL_PROGRAM = install -m 755 -p +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p + +####### Output directory + +OBJECTS_DIR = debug/ + +####### Files + +SOURCES = main.cpp \ + fbbrowser.cpp debug/moc_fbbrowser.cpp +OBJECTS = debug/main.o \ + debug/fbbrowser.o \ + debug/moc_fbbrowser.o +DIST = /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/g++.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/unix.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/linux.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/qws.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qconfig.pri \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/modules/qt_webkit_version.pri \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt_functions.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt_config.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/exclusive_builds.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_pre.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/debug.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/debug_and_release.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_post.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/build_pass.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/warn_on.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/unix/thread.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/moc.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/resources.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/uic.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/yacc.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/lex.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/include_source_dir.prf \ + fbbrowser.pro +QMAKE_TARGET = fbbrowser +DESTDIR = +TARGET = fbbrowser + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx .C + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.C.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile.Debug $(TARGET) + +$(TARGET): ui_fbbrowser.h $(OBJECTS) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +qmake: FORCE + @$(QMAKE) CONFIG+=debug_and_release -o Makefile.Debug fbbrowser.pro + +dist: + @$(CHK_DIR_EXISTS) debug/fbbrowser1.0.0 || $(MKDIR) debug/fbbrowser1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/fbbrowser1.0.0/ && $(COPY_FILE) --parents fbbrowser.h debug/fbbrowser1.0.0/ && $(COPY_FILE) --parents main.cpp fbbrowser.cpp debug/fbbrowser1.0.0/ && $(COPY_FILE) --parents fbbrowser.ui debug/fbbrowser1.0.0/ && (cd `dirname debug/fbbrowser1.0.0` && $(TAR) fbbrowser1.0.0.tar fbbrowser1.0.0 && $(COMPRESS) fbbrowser1.0.0.tar) && $(MOVE) `dirname debug/fbbrowser1.0.0`/fbbrowser1.0.0.tar.gz . && $(DEL_FILE) -r debug/fbbrowser1.0.0 + + +clean:compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +####### Sub-libraries + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) Makefile.Debug + + +check: first + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all + +compiler_moc_header_make_all: debug/moc_fbbrowser.cpp +compiler_moc_header_clean: + -$(DEL_FILE) debug/moc_fbbrowser.cpp +debug/moc_fbbrowser.cpp: ui_fbbrowser.h \ + fbbrowser.h + /usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) fbbrowser.h -o debug/moc_fbbrowser.cpp + +compiler_rcc_make_all: +compiler_rcc_clean: +compiler_image_collection_make_all: qmake_image_collection.cpp +compiler_image_collection_clean: + -$(DEL_FILE) qmake_image_collection.cpp +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: ui_fbbrowser.h +compiler_uic_clean: + -$(DEL_FILE) ui_fbbrowser.h +ui_fbbrowser.h: fbbrowser.ui + /usr/local/Trolltech/QtEmbedded-4.7.1/bin/uic fbbrowser.ui -o ui_fbbrowser.h + +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_moc_header_clean compiler_uic_clean + +####### Compile + +debug/main.o: main.cpp fbbrowser.h \ + ui_fbbrowser.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/main.o main.cpp + +debug/fbbrowser.o: fbbrowser.cpp fbbrowser.h \ + ui_fbbrowser.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/fbbrowser.o fbbrowser.cpp + +debug/moc_fbbrowser.o: debug/moc_fbbrowser.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_fbbrowser.o debug/moc_fbbrowser.cpp + +####### Install + +install: FORCE + +uninstall: FORCE + +FORCE: + diff --git a/src/Makefile.Release b/src/Makefile.Release new file mode 100644 index 0000000..cbe28a3 --- /dev/null +++ b/src/Makefile.Release @@ -0,0 +1,179 @@ +############################################################################# +# Makefile for building: fbbrowser +# Generated by qmake (2.01a) (Qt 4.7.1) on: Wed Jan 12 12:12:05 2011 +# Project: fbbrowser.pro +# Template: app +############################################################################# + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) +INCPATH = -I/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qws/linux-x86-g++ -I. -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtCore -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtNetwork -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtGui -I/usr/local/Trolltech/QtEmbedded-4.7.1/include -Irelease -I. +LINK = g++ +LFLAGS = -Wl,-O1 -Wl,-rpath,/usr/local/Trolltech/QtEmbedded-4.7.1/lib +LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtNetwork -lQtCore -lpthread +AR = ar cqs +RANLIB = +QMAKE = /usr/local/Trolltech/QtEmbedded-4.7.1/bin/qmake +TAR = tar -cf +COMPRESS = gzip -9f +COPY = cp -f +SED = sed +COPY_FILE = $(COPY) +COPY_DIR = $(COPY) -r +STRIP = strip +INSTALL_FILE = install -m 644 -p +INSTALL_DIR = $(COPY_DIR) +INSTALL_PROGRAM = install -m 755 -p +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p + +####### Output directory + +OBJECTS_DIR = release/ + +####### Files + +SOURCES = main.cpp \ + fbbrowser.cpp release/moc_fbbrowser.cpp +OBJECTS = release/main.o \ + release/fbbrowser.o \ + release/moc_fbbrowser.o +DIST = /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/g++.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/unix.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/linux.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/qws.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qconfig.pri \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/modules/qt_webkit_version.pri \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt_functions.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt_config.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/exclusive_builds.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_pre.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/release.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/debug_and_release.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_post.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/build_pass.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/warn_on.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/unix/thread.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/moc.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/resources.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/uic.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/yacc.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/lex.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/include_source_dir.prf \ + fbbrowser.pro +QMAKE_TARGET = fbbrowser +DESTDIR = +TARGET = fbbrowser + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx .C + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.C.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile.Release $(TARGET) + +$(TARGET): ui_fbbrowser.h $(OBJECTS) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +qmake: FORCE + @$(QMAKE) CONFIG+=debug_and_release -o Makefile.Release fbbrowser.pro + +dist: + @$(CHK_DIR_EXISTS) release/fbbrowser1.0.0 || $(MKDIR) release/fbbrowser1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) release/fbbrowser1.0.0/ && $(COPY_FILE) --parents fbbrowser.h release/fbbrowser1.0.0/ && $(COPY_FILE) --parents main.cpp fbbrowser.cpp release/fbbrowser1.0.0/ && $(COPY_FILE) --parents fbbrowser.ui release/fbbrowser1.0.0/ && (cd `dirname release/fbbrowser1.0.0` && $(TAR) fbbrowser1.0.0.tar fbbrowser1.0.0 && $(COMPRESS) fbbrowser1.0.0.tar) && $(MOVE) `dirname release/fbbrowser1.0.0`/fbbrowser1.0.0.tar.gz . && $(DEL_FILE) -r release/fbbrowser1.0.0 + + +clean:compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +####### Sub-libraries + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) Makefile.Release + + +check: first + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all + +compiler_moc_header_make_all: release/moc_fbbrowser.cpp +compiler_moc_header_clean: + -$(DEL_FILE) release/moc_fbbrowser.cpp +release/moc_fbbrowser.cpp: ui_fbbrowser.h \ + fbbrowser.h + /usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) fbbrowser.h -o release/moc_fbbrowser.cpp + +compiler_rcc_make_all: +compiler_rcc_clean: +compiler_image_collection_make_all: qmake_image_collection.cpp +compiler_image_collection_clean: + -$(DEL_FILE) qmake_image_collection.cpp +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: ui_fbbrowser.h +compiler_uic_clean: + -$(DEL_FILE) ui_fbbrowser.h +ui_fbbrowser.h: fbbrowser.ui + /usr/local/Trolltech/QtEmbedded-4.7.1/bin/uic fbbrowser.ui -o ui_fbbrowser.h + +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_moc_header_clean compiler_uic_clean + +####### Compile + +release/main.o: main.cpp fbbrowser.h \ + ui_fbbrowser.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/main.o main.cpp + +release/fbbrowser.o: fbbrowser.cpp fbbrowser.h \ + ui_fbbrowser.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/fbbrowser.o fbbrowser.cpp + +release/moc_fbbrowser.o: release/moc_fbbrowser.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_fbbrowser.o release/moc_fbbrowser.cpp + +####### Install + +install: FORCE + +uninstall: FORCE + +FORCE: + diff --git a/src/debug/fbbrowser.o b/src/debug/fbbrowser.o new file mode 100644 index 0000000..82acc90 Binary files /dev/null and b/src/debug/fbbrowser.o differ diff --git a/src/debug/main.o b/src/debug/main.o new file mode 100644 index 0000000..dd2b6c9 Binary files /dev/null and b/src/debug/main.o differ diff --git a/src/debug/moc_fbbrowser.cpp b/src/debug/moc_fbbrowser.cpp new file mode 100644 index 0000000..0282b32 --- /dev/null +++ b/src/debug/moc_fbbrowser.cpp @@ -0,0 +1,69 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'fbbrowser.h' +** +** Created: Wed Jan 12 12:12:08 2011 +** by: The Qt Meta Object Compiler version 62 (Qt 4.7.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "../fbbrowser.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'fbbrowser.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 62 +#error "This file was generated using the moc from 4.7.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_fbbrowser[] = { + + // content: + 5, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_fbbrowser[] = { + "fbbrowser\0" +}; + +const QMetaObject fbbrowser::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_fbbrowser, + qt_meta_data_fbbrowser, 0 } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &fbbrowser::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *fbbrowser::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *fbbrowser::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_fbbrowser)) + return static_cast(const_cast< fbbrowser*>(this)); + return QWidget::qt_metacast(_clname); +} + +int fbbrowser::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/debug/moc_fbbrowser.o b/src/debug/moc_fbbrowser.o new file mode 100644 index 0000000..55373e8 Binary files /dev/null and b/src/debug/moc_fbbrowser.o differ diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp new file mode 100644 index 0000000..50fc86a --- /dev/null +++ b/src/fbbrowser.cpp @@ -0,0 +1,89 @@ +#include "fbbrowser.h" +#include +#include +#include + +void fbbrowser::httpReadyRead() +{ + // This slot listens to readyRead() signal from our QNetworkReply. + qDebug() << "readyRead() signal emmited!" << endl; + if(reply->error() == QNetworkReply::NoError) + { + qDebug() << "No error, loading given URL..."; + view->load(url); + } +} + +fbbrowser::fbbrowser(const QUrl & url) +{ + view = new QWebView(this); + + // Create QNetworkAccessManager which is needed to send/receive requests. + manager = new QNetworkAccessManager(this); + // Create a QNetworkRequest object and set its URL. + // QNetworkRequest request; + request.setUrl(url); + + // Check Internet connection + // Let the manager send the request and receive the reply. + // QNetworkReply *reply = manager->get(request); + *reply = manager->get(request); + connect(reply, SIGNAL(readyRead()), this, SLOT(httpReadyRead())); + //connect(reply, SIGNAL(finished()), this, SLOT()); + + // Check if the reply is an error message. + qDebug() << "QNetworkReply error code: " << reply->error(); + + // TODO: error differentiation + // reply->error() returns 0 even for invalid URL. + // A possibility to check for validity, is to listen to readyRead() + // signal, haven't found a better way yet ... + //if(reply->error() == QNetworkReply::NoError) + //{ + // qDebug() << "No error, loading given URL..."; + // view->load(url); + //} + //else + //{ + // qDebug() << "Error occured, loading error page..."; + // view->load(QUrl("qrc:/html/errorPage.html")); + //} + + //remove the window decoration + this->setWindowFlags(Qt::SplashScreen); + + //enable JavaScript access to qt objects + QObject::connect(view->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(addJSObject())); + + //set form to fullscreen + this->showFullScreen(); + + setCentralWidget(view); +} + +// Destructor +fbbrowser::~fbbrowser() +{ +} + +// +void fbbrowser::addJSObject() +{ + view->page()->mainFrame()->addToJavaScriptWindowObject(QString("webkitTest"), this); +} + +void fbbrowser::writeText(QString text) +{ + QFile file("out.txt"); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) + return; + + QTextStream out(&file); + out << text << "\n"; +} + +// This function needed now ? +void fbbrowser::quitAll() +{ + //emit lastWindowClosed(); +} diff --git a/src/fbbrowser.h b/src/fbbrowser.h new file mode 100644 index 0000000..c869197 --- /dev/null +++ b/src/fbbrowser.h @@ -0,0 +1,40 @@ +#ifndef FBBROWSER_H +#define FBBROWSER_H + +#include +#include "ui_fbbrowser.h" +#include + +class QWebView; +//QT_BEGIN_NAMESPACE +//class QLineEdit; +//QT_END_NAMESPACE + +class fbbrowser : public QMainWindow +{ + Q_OBJECT + +public: + fbbrowser(const QUrl& url); + ~fbbrowser(); + void printusage(); + Q_INVOKABLE void writeText(QString text); //used for writing web content into a file + Q_INVOKABLE void quitAll(); + +private: + QUrl url; + QNetworkRequest request; + QNetworkReply *reply; + QWebView * view; + QNetworkAccessManager * manager; + //QApplication * app(int & argc, char ** argv); + +private slots: + void httpReadyRead(); + void addJSObject(); + +signals: + void signalQuitAll(); +}; + +#endif // FBBROWSER_H diff --git a/src/fbbrowser.ui b/src/fbbrowser.ui new file mode 100644 index 0000000..a02b1ab --- /dev/null +++ b/src/fbbrowser.ui @@ -0,0 +1,19 @@ + + fbbrowserClass + + + + 0 + 0 + 400 + 300 + + + + fbbrowser + + + + + + diff --git a/src/fbgui.cpp b/src/fbgui.cpp new file mode 100644 index 0000000..fe67b79 --- /dev/null +++ b/src/fbgui.cpp @@ -0,0 +1,83 @@ +#include "fbbrowser.h" + +#include +#include +#include +#include +#include + + +void printUsage() +{ + // Prints usage information, incomplete. + // Q: How is the -qws option handled, mention it here or not? + QTextStream qout(stdout); + qout << QObject::tr("Usage: ./fbgui [OPTIONS] ") << endl; + qout << QObject::tr("Options:") << endl; + qout << "-h or --help " << QObject::tr("Prints usage information.") << endl; + qout << "-qws " << QObject::tr("Set this application to also be the server application.") << endl; + qout << " " << QObject::tr("Skip this option if you have a QT server application") << endl; + exit(1); +} + +QString getPath(const char* c) +{ + QString appPath = c; + // Locate last '/' in the full path and remove all the chars after it. + appPath.chop(appPath.length() - 1 + - appPath.lastIndexOf("/", appPath.length()-1)); + qDebug() << "Application path: " << appPath; + return appPath; +} + +int main(int argc, char *argv[]) +{ + // Parse command line arguments. + int opt = 0; + int longIndex = 0; + // Declare the short options as a char*, these have exactly one - followed by letter from optString. + // For example: ./fbbrowser -h + // Declare the long options in the const struct, these have two - followed by a string found in longOpts[]. + // Same as: ./fbbrowser --help + // Note: I included 'qws' here to not have errors, when setting fbbrowser to be the server app aswell. + static const char *optString = "hqws"; + static const struct option longOpts[] = + { + // If an option requires parameters, write this number instead of no_argument. + // The last argument, is the corresponding char to the option string. + {"help", no_argument, NULL, 'h'} + }; + // getopt_long returns the index of the next argument to be read, -1 if there are no more arguments. + opt = getopt_long(argc, argv, optString, longOpts, &longIndex); + while (opt != -1) + { + switch(opt) + { + case 'h': + printUsage(); + break; + } + opt = getopt_long(argc, argv, optString, longOpts, &longIndex); + } + // This is the main object of a QT Application. + QApplication a(argc, argv); + // Is this really needed, since we kill the app through the fbbrowser object? + QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); + // Get the application path. + QString appPath = getPath(argv[0]); + // This part reads the URL to load from the arguments given through the commandline. + QUrl url; + if (argc > 1) + url = QUrl(argv[1]); + else //Default URL to load + url = QUrl("http://132.230.4.3/webkitTest.html"); + // Create a new Framebuffer-Browser object for displaying the given URL. + fbbrowser *fbb = new fbbrowser(url); + // Listen to the signalQuitAll() Signal to kill the app from within the browser. + QObject::connect(fbb, SIGNAL(signalQuitAll()), &a, SLOT(quit())); + // Display the browser. + fbb->show(); + + // Exit the application. + return a.exec(); +} diff --git a/src/fbgui.h b/src/fbgui.h new file mode 100644 index 0000000..c65a31f --- /dev/null +++ b/src/fbgui.h @@ -0,0 +1,28 @@ +#ifndef FBGUI_H +#define FBGUI_H + +#include + + +//QT_BEGIN_NAMESPACE +//QT_END_NAMESPACE + +class fbgui : public QMainWindow +{ + Q_OBJECT + +public: + fbgui(); + ~fbgui(); + void printUsage(); + QString getPath(const char* c); + +//private: + +//private slots: + +//signals: + +}; + +#endif // FBGUI_H diff --git a/src/fbgui.pro b/src/fbgui.pro new file mode 100644 index 0000000..c1bcf82 --- /dev/null +++ b/src/fbgui.pro @@ -0,0 +1,12 @@ +TEMPLATE = app +TARGET = fbgui +CONFIG += qt debug +QT += core \ + gui \ + webkit \ + network +HEADERS += fbbrowser.h +SOURCES += fbgui.cpp \ + fbbrowser.cpp +FORMS += fbbrowser.ui +RESOURCES += fbgui.qrc diff --git a/src/fbgui.qrc b/src/fbgui.qrc new file mode 100644 index 0000000..da051a4 --- /dev/null +++ b/src/fbgui.qrc @@ -0,0 +1,5 @@ + + + html/errorPage.html + + diff --git a/src/html/errorPage.html b/src/html/errorPage.html new file mode 100644 index 0000000..271d9fe --- /dev/null +++ b/src/html/errorPage.html @@ -0,0 +1,32 @@ + + + + + + + + +

ERROR

+ +

+No Internet Connection or Server is down. + + +Please contact your Administrator. +

+ +
+

+ +

+
+ + + diff --git a/src/testApp.sh b/src/testApp.sh new file mode 100755 index 0000000..0995695 --- /dev/null +++ b/src/testApp.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# This script now needs to have the URL to load as an argument. +if [ $# = 0 ]; then + echo "No URL passed, exiting..." + exit +fi +# Start QT's virtual framebuffer +/usr/local/Trolltech/Qt-4.7.1/bin/qvfb -width 800 -height 600 & +# Wait for it to load (needed?) +sleep 1 +# Start the fbbrowser app. +# This requires the fbgui git repository to be in the user's home directory. +export PATH=~/fbgui/fbbrowser/:$PATH +fbgui -qws $1 +# Check if fbbrowser is not running, if so kill the qvfb. +if [ $(ps aux | grep -v grep | grep -c fbgui) -eq 1 ] +then + echo "fbgui is still running ..." +else + echo "fbgui stopped running, killing qvfb ..." + killall qvfb +fi diff --git a/webkitTest/.cproject b/webkitTest/.cproject deleted file mode 100644 index 43adce0..0000000 --- a/webkitTest/.cproject +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - make - release - false - false - true - - - make - debug - false - false - true - - - - - - diff --git a/webkitTest/.metadata/.lock b/webkitTest/.metadata/.lock deleted file mode 100644 index e69de29..0000000 diff --git a/webkitTest/.metadata/.log b/webkitTest/.metadata/.log deleted file mode 100644 index 63e1b10..0000000 --- a/webkitTest/.metadata/.log +++ /dev/null @@ -1,13 +0,0 @@ -!SESSION 2011-01-12 12:08:33.552 ----------------------------------------------- -eclipse.buildId=M20100909-0800 -java.version=1.6.0_20 -java.vendor=Sun Microsystems Inc. -BootLoader constants: OS=linux, ARCH=x86, WS=gtk, NL=en_US -Framework arguments: -product org.eclipse.epp.package.linuxtools.product -Command-line arguments: -os linux -ws gtk -arch x86 -product org.eclipse.epp.package.linuxtools.product - -!ENTRY org.eclipse.ui 4 4 2011-01-12 12:08:52.223 -!MESSAGE Plugin org.eclipse.linuxtools.callgraph, extension org.eclipse.ui.perspectiveExtensions, id org.eclipse.linuxtools.callgraph.callgraphview: Attribute 'relative' not defined. This attribute is required when relationship="stack". - -!ENTRY org.eclipse.ui 4 4 2011-01-12 12:08:52.226 -!MESSAGE Unable to process element: view in perspective extension: null diff --git a/webkitTest/.metadata/.mylyn/repositories.xml.zip b/webkitTest/.metadata/.mylyn/repositories.xml.zip deleted file mode 100644 index 9b4cdfe..0000000 Binary files a/webkitTest/.metadata/.mylyn/repositories.xml.zip and /dev/null differ diff --git a/webkitTest/.metadata/.plugins/org.eclipse.cdt.core/.log b/webkitTest/.metadata/.plugins/org.eclipse.cdt.core/.log deleted file mode 100644 index d46e052..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.cdt.core/.log +++ /dev/null @@ -1 +0,0 @@ -*** SESSION Jan 12, 2011 12:08:51.97 ------------------------------------------- diff --git a/webkitTest/.metadata/.plugins/org.eclipse.cdt.make.core/specs.c b/webkitTest/.metadata/.plugins/org.eclipse.cdt.make.core/specs.c deleted file mode 100644 index 8b13789..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.cdt.make.core/specs.c +++ /dev/null @@ -1 +0,0 @@ - diff --git a/webkitTest/.metadata/.plugins/org.eclipse.cdt.make.core/specs.cpp b/webkitTest/.metadata/.plugins/org.eclipse.cdt.make.core/specs.cpp deleted file mode 100644 index 8b13789..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.cdt.make.core/specs.cpp +++ /dev/null @@ -1 +0,0 @@ - diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version deleted file mode 100644 index 25cb955..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index deleted file mode 100644 index 9c245ea..0000000 Binary files a/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index and /dev/null differ diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version deleted file mode 100644 index 6b2aaa7..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree b/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree deleted file mode 100644 index 2db0082..0000000 Binary files a/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree and /dev/null differ diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources deleted file mode 100644 index d995e8e..0000000 Binary files a/webkitTest/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and /dev/null differ diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.ui.prefs b/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.ui.prefs deleted file mode 100644 index eb63329..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.ui.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Wed Jan 12 12:09:08 CET 2011 -spelling_locale_initialized=true -useAnnotationsPrefPage=true -eclipse.preferences.version=1 -useQuickDiffPrefPage=true diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7015bd7..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Jan 12 12:09:08 CET 2011 -version=1 -eclipse.preferences.version=1 diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.recording.prefs b/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.recording.prefs deleted file mode 100644 index cbe18ad..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.recording.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Jan 12 12:08:57 CET 2011 -org.eclipse.epp.usagedata.recording.last-upload=1294830537469 -eclipse.preferences.version=1 diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 992ea02..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,15 +0,0 @@ -#Wed Jan 12 12:09:08 CET 2011 -useQuickDiffPrefPage=true -proposalOrderMigrated=true -tabWidthPropagated=true -content_assist_proposals_background=255,255,255 -org.eclipse.jdt.ui.javadoclocations.migrated=true -useAnnotationsPrefPage=true -org.eclipse.jface.textfont=1|Monospace|10.0|0|GTK|1|; -org.eclipse.jdt.internal.ui.navigator.layout=2 -org.eclipse.jdt.ui.editor.tab.width= -org.eclipse.jdt.ui.formatterprofiles.version=11 -spelling_locale_initialized=true -eclipse.preferences.version=1 -content_assist_proposals_foreground=58,57,53 -fontPropagated=true diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs b/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs deleted file mode 100644 index 0054f75..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Jan 12 12:08:55 CET 2011 -eclipse.preferences.version=1 -mylyn.attention.migrated=true diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs b/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs deleted file mode 100644 index ba985f5..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Jan 12 12:08:55 CET 2011 -org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true -eclipse.preferences.version=1 diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs b/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs deleted file mode 100644 index 6076312..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Jan 12 12:09:08 CET 2011 -pref_first_startup=false -eclipse.preferences.version=1 diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs b/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs deleted file mode 100644 index bd804a3..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Jan 12 12:09:09 CET 2011 -eclipse.preferences.version=1 -org.eclipse.team.ui.first_time=false diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs deleted file mode 100644 index 6036702..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Wed Jan 12 12:09:09 CET 2011 -eclipse.preferences.version=1 -tipsAndTricks=true -platformState=1294238342918 -quickStart=false -PROBLEMS_FILTERS_MIGRATE=true diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs b/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs deleted file mode 100644 index 4f34048..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Jan 12 12:08:53 CET 2011 -eclipse.preferences.version=1 -showIntro=false diff --git a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs deleted file mode 100644 index 1f9d08e..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Jan 12 12:08:56 CET 2011 -eclipse.preferences.version=1 -ENABLED_DECORATORS=org.eclipse.cdt.ui.indexedFiles\:false,org.eclipse.cdt.managedbuilder.ui.excludedFile\:true,org.eclipse.jdt.ui.override.decorator\:true,org.eclipse.jdt.ui.interface.decorator\:false,org.eclipse.jdt.ui.buildpath.decorator\:true,org.eclipse.mylyn.context.ui.decorator.interest\:true,org.eclipse.mylyn.tasks.ui.decorators.task\:true,org.eclipse.mylyn.team.ui.changeset.decorator\:true,org.eclipse.team.cvs.ui.decorator\:true,org.eclipse.ui.LinkedResourceDecorator\:true,org.eclipse.ui.VirtualResourceDecorator\:true,org.eclipse.ui.ContentTypeDecorator\:true,org.eclipse.ui.ResourceFilterDecorator\:false, diff --git a/webkitTest/.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv b/webkitTest/.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv deleted file mode 100644 index b839af4..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv +++ /dev/null @@ -1,126 +0,0 @@ -what,kind,bundleId,bundleVersion,description,time -activated,perspective,org.eclipse.cdt.ui,,"org.eclipse.cdt.ui.CPerspective",1294830536393 -started,bundle,org.eclipse.osgi,3.6.1.R36x_v20100806,"org.eclipse.osgi",1294830536394 -started,bundle,org.eclipse.equinox.simpleconfigurator,1.0.200.v20100503,"org.eclipse.equinox.simpleconfigurator",1294830536395 -started,bundle,com.ibm.icu,4.2.1.v20100412,"com.ibm.icu",1294830536395 -started,bundle,org.eclipse.cdt.core,5.2.1.201009141542,"org.eclipse.cdt.core",1294830536396 -started,bundle,org.eclipse.cdt.make.core,7.0.0.201009141542,"org.eclipse.cdt.make.core",1294830536397 -started,bundle,org.eclipse.cdt.make.ui,7.0.0.201009141542,"org.eclipse.cdt.make.ui",1294830536401 -started,bundle,org.eclipse.cdt.managedbuilder.core,7.0.1.201009141542,"org.eclipse.cdt.managedbuilder.core",1294830536402 -started,bundle,org.eclipse.cdt.ui,5.2.1.201009141542,"org.eclipse.cdt.ui",1294830536403 -started,bundle,org.eclipse.core.contenttype,3.4.100.v20100505-1235,"org.eclipse.core.contenttype",1294830536404 -started,bundle,org.eclipse.core.databinding.observable,1.3.0.I20100601-0800,"org.eclipse.core.databinding.observable",1294830536404 -started,bundle,org.eclipse.core.expressions,3.4.200.v20100505,"org.eclipse.core.expressions",1294830536405 -started,bundle,org.eclipse.core.filebuffers,3.5.100.v20100520-0800,"org.eclipse.core.filebuffers",1294830536405 -started,bundle,org.eclipse.core.filesystem,1.3.1.R36x_v20100727-0745,"org.eclipse.core.filesystem",1294830536405 -started,bundle,org.eclipse.core.jobs,3.5.1.R36x_v20100824,"org.eclipse.core.jobs",1294830536406 -started,bundle,org.eclipse.core.net,1.2.100.I20100511-0800,"org.eclipse.core.net",1294830536406 -started,bundle,org.eclipse.core.resources,3.6.0.R36x_v20100825-0600,"org.eclipse.core.resources",1294830536406 -started,bundle,org.eclipse.core.runtime,3.6.0.v20100505,"org.eclipse.core.runtime",1294830536407 -started,bundle,org.eclipse.core.runtime.compatibility,3.2.100.v20100505,"org.eclipse.core.runtime.compatibility",1294830536407 -started,bundle,org.eclipse.core.runtime.compatibility.auth,3.2.200.v20100517,"org.eclipse.core.runtime.compatibility.auth",1294830536408 -started,bundle,org.eclipse.debug.core,3.6.0.v20100519,"org.eclipse.debug.core",1294830536409 -started,bundle,org.eclipse.epp.usagedata.gathering,1.3.0.R201005261100,"org.eclipse.epp.usagedata.gathering",1294830536409 -started,bundle,org.eclipse.epp.usagedata.recording,1.3.0.R201005261100,"org.eclipse.epp.usagedata.recording",1294830536409 -started,bundle,org.eclipse.equinox.app,1.3.1.R36x_v20100803,"org.eclipse.equinox.app",1294830536409 -started,bundle,org.eclipse.equinox.common,3.6.0.v20100503,"org.eclipse.equinox.common",1294830536410 -started,bundle,org.eclipse.equinox.ds,1.2.1.R36x_v20100803,"org.eclipse.equinox.ds",1294830536410 -started,bundle,org.eclipse.equinox.event,1.2.0.v20100503,"org.eclipse.equinox.event",1294830536411 -started,bundle,org.eclipse.equinox.p2.core,2.0.2.R36x_v20100804,"org.eclipse.equinox.p2.core",1294830536411 -started,bundle,org.eclipse.equinox.p2.directorywatcher,1.0.202.R36x_v20100727,"org.eclipse.equinox.p2.directorywatcher",1294830536411 -started,bundle,org.eclipse.equinox.p2.engine,2.0.0.v20100606,"org.eclipse.equinox.p2.engine",1294830536412 -started,bundle,org.eclipse.equinox.p2.metadata,2.0.0.v20100601,"org.eclipse.equinox.p2.metadata",1294830536412 -started,bundle,org.eclipse.equinox.p2.metadata.repository,1.1.0.v20100513,"org.eclipse.equinox.p2.metadata.repository",1294830536415 -started,bundle,org.eclipse.equinox.p2.operations,2.0.0.v20100510,"org.eclipse.equinox.p2.operations",1294830536416 -started,bundle,org.eclipse.equinox.p2.reconciler.dropins,1.1.0.v20100525,"org.eclipse.equinox.p2.reconciler.dropins",1294830536416 -started,bundle,org.eclipse.equinox.p2.repository,2.0.1.R36x_v20100823,"org.eclipse.equinox.p2.repository",1294830536416 -started,bundle,org.eclipse.equinox.p2.ui.sdk.scheduler,1.0.0.v20100507-1815,"org.eclipse.equinox.p2.ui.sdk.scheduler",1294830536417 -started,bundle,org.eclipse.equinox.p2.updatechecker,1.1.101.R36x_v20100823,"org.eclipse.equinox.p2.updatechecker",1294830536417 -started,bundle,org.eclipse.equinox.preferences,3.3.0.v20100503,"org.eclipse.equinox.preferences",1294830536417 -started,bundle,org.eclipse.equinox.registry,3.5.0.v20100503,"org.eclipse.equinox.registry",1294830536417 -started,bundle,org.eclipse.equinox.security,1.0.200.v20100503,"org.eclipse.equinox.security",1294830536418 -started,bundle,org.eclipse.equinox.util,1.0.200.v20100503,"org.eclipse.equinox.util",1294830536418 -started,bundle,org.eclipse.help,3.5.0.v20100524,"org.eclipse.help",1294830536419 -started,bundle,org.eclipse.jdt.core,3.6.1.v_A68_R36x,"org.eclipse.jdt.core",1294830536419 -started,bundle,org.eclipse.jdt.core.manipulation,1.3.0.v20100520-0800,"org.eclipse.jdt.core.manipulation",1294830536419 -started,bundle,org.eclipse.jdt.ui,3.6.1.r361_v20100825-0800,"org.eclipse.jdt.ui",1294830536422 -started,bundle,org.eclipse.jface,3.6.1.M20100825-0800,"org.eclipse.jface",1294830536423 -started,bundle,org.eclipse.jsch.core,1.1.200.I20100505-1245,"org.eclipse.jsch.core",1294830536428 -started,bundle,org.eclipse.linuxtools.systemtap.ui.dashboardextension,0.3.0.201009101021,"org.eclipse.linuxtools.systemtap.ui.dashboardextension",1294830536429 -started,bundle,org.eclipse.linuxtools.systemtap.ui.editor,0.3.0.201009101021,"org.eclipse.linuxtools.systemtap.ui.editor",1294830536429 -started,bundle,org.eclipse.linuxtools.systemtap.ui.graphicalrun,0.3.0.201009101021,"org.eclipse.linuxtools.systemtap.ui.graphicalrun",1294830536429 -started,bundle,org.eclipse.ltk.core.refactoring,3.5.100.v20100526-0800,"org.eclipse.ltk.core.refactoring",1294830536430 -started,bundle,org.eclipse.ltk.ui.refactoring,3.5.0.v20100526-0800,"org.eclipse.ltk.ui.refactoring",1294830536430 -started,bundle,org.eclipse.mylyn.bugzilla.core,3.4.2.v20100902-0100-e3x,"org.eclipse.mylyn.bugzilla.core",1294830536431 -started,bundle,org.eclipse.mylyn.bugzilla.ui,3.4.2.v20100909-0100-e3x,"org.eclipse.mylyn.bugzilla.ui",1294830536431 -started,bundle,org.eclipse.mylyn.commons.net,3.4.1.v20100625-2100-e3x,"org.eclipse.mylyn.commons.net",1294830536431 -started,bundle,org.eclipse.mylyn.commons.ui,3.4.0.v20100608-0100-e3x,"org.eclipse.mylyn.commons.ui",1294830536431 -started,bundle,org.eclipse.mylyn.context.core,3.4.1.v20100909-0100-e3x,"org.eclipse.mylyn.context.core",1294830536431 -started,bundle,org.eclipse.mylyn.context.ui,3.4.1.v20100909-0100-e3x,"org.eclipse.mylyn.context.ui",1294830536432 -started,bundle,org.eclipse.mylyn.monitor.ui,3.4.0.v20100608-0100-e3x,"org.eclipse.mylyn.monitor.ui",1294830536432 -started,bundle,org.eclipse.mylyn.tasks.ui,3.4.2.v20100902-0100-e3x,"org.eclipse.mylyn.tasks.ui",1294830536433 -started,bundle,org.eclipse.mylyn.team.ui,3.4.2.v20100909-0100-e3x,"org.eclipse.mylyn.team.ui",1294830536433 -started,bundle,org.eclipse.team.core,3.5.100.R36x_v20100825-0800,"org.eclipse.team.core",1294830536433 -started,bundle,org.eclipse.team.cvs.core,3.3.300.I20100526-0800,"org.eclipse.team.cvs.core",1294830536434 -started,bundle,org.eclipse.team.cvs.ui,3.3.301.R36x_v20100825-0800,"org.eclipse.team.cvs.ui",1294830536437 -started,bundle,org.eclipse.team.ui,3.5.101.R36x_v20100825-0800,"org.eclipse.team.ui",1294830536437 -started,bundle,org.eclipse.ui,3.6.1.M20100826-1330,"org.eclipse.ui",1294830536438 -started,bundle,org.eclipse.ui.console,3.5.0.v20100526,"org.eclipse.ui.console",1294830536439 -started,bundle,org.eclipse.ui.editors,3.6.1.r361_v20100825-0800,"org.eclipse.ui.editors",1294830536447 -started,bundle,org.eclipse.ui.forms,3.5.2.r36_v20100702,"org.eclipse.ui.forms",1294830536447 -started,bundle,org.eclipse.ui.ide,3.6.1.M20100825-0800,"org.eclipse.ui.ide",1294830536448 -started,bundle,org.eclipse.ui.intro,3.4.0.v20100427,"org.eclipse.ui.intro",1294830536456 -started,bundle,org.eclipse.ui.intro.universal,3.2.402.r36_v20100702,"org.eclipse.ui.intro.universal",1294830536456 -started,bundle,org.eclipse.ui.navigator,3.5.0.I20100601-0800,"org.eclipse.ui.navigator",1294830536456 -started,bundle,org.eclipse.ui.navigator.resources,3.4.201.M20100707-0800,"org.eclipse.ui.navigator.resources",1294830536456 -started,bundle,org.eclipse.ui.net,1.2.100.I20100505-1245,"org.eclipse.ui.net",1294830536457 -started,bundle,org.eclipse.ui.views,3.5.0.I20100527-0800,"org.eclipse.ui.views",1294830536457 -started,bundle,org.eclipse.ui.workbench,3.6.1.M20100826-1330,"org.eclipse.ui.workbench",1294830536457 -started,bundle,org.eclipse.ui.workbench.texteditor,3.6.1.r361_v20100714-0800,"org.eclipse.ui.workbench.texteditor",1294830536458 -started,bundle,org.eclipse.update.configurator,3.3.100.v20100512,"org.eclipse.update.configurator",1294830536459 -started,bundle,org.eclipse.update.core,3.2.402.R36x_v20100629,"org.eclipse.update.core",1294830536459 -started,bundle,org.eclipse.update.scheduler,3.2.300.v20100512,"org.eclipse.update.scheduler",1294830536459 -started,bundle,com.trolltech.qtcppproject,1.6.1,"com.trolltech.qtcppproject",1294830536459 -os,sysinfo,,,"linux",1294830536465 -arch,sysinfo,,,"x86",1294830536465 -ws,sysinfo,,,"gtk",1294830536465 -locale,sysinfo,,,"en_US",1294830536465 -processors,sysinfo,,,"2",1294830536465 -java.runtime.name,sysinfo,,,"OpenJDK Runtime Environment",1294830536465 -java.runtime.version,sysinfo,,,"1.6.0_20-b20",1294830536465 -java.specification.name,sysinfo,,,"Java Platform API Specification",1294830536465 -java.specification.vendor,sysinfo,,,"Sun Microsystems Inc.",1294830536465 -java.specification.version,sysinfo,,,"1.6",1294830536465 -java.vendor,sysinfo,,,"Sun Microsystems Inc.",1294830536465 -java.version,sysinfo,,,"1.6.0_20",1294830536465 -java.vm.info,sysinfo,,,"mixed mode, sharing",1294830536465 -java.vm.name,sysinfo,,,"OpenJDK Client VM",1294830536465 -java.vm.specification.name,sysinfo,,,"Java Virtual Machine Specification",1294830536465 -java.vm.specification.vendor,sysinfo,,,"Sun Microsystems Inc.",1294830536465 -java.vm.specification.version,sysinfo,,,"1.0",1294830536465 -java.vm.vendor,sysinfo,,,"Sun Microsystems Inc.",1294830536465 -java.vm.version,sysinfo,,,"19.0-b09",1294830536465 -activated,view,org.eclipse.ui.navigator.resources,3.4.201.M20100707-0800,"org.eclipse.ui.navigator.ProjectExplorer",1294830542286 -activated,view,org.eclipse.ui.navigator.resources,3.4.201.M20100707-0800,"org.eclipse.ui.navigator.ProjectExplorer",1294830542304 -closed,view,org.eclipse.ui,3.6.1.M20100826-1330,"org.eclipse.ui.internal.introview",1294830542315 -deactivated,workbench,org.eclipse.ui.workbench,3.6.1.M20100826-1330,"",1294830546856 -closed,workbench,org.eclipse.ui.workbench,3.6.1.M20100826-1330,"",1294830548223 -started,bundle,org.eclipse.compare,3.5.100.I20100526-0800,"org.eclipse.compare",1294830548583 -stopped,bundle,org.eclipse.linuxtools.valgrind.massif,0.6.1.201009101021,"org.eclipse.linuxtools.valgrind.massif",1294830548825 -stopped,bundle,org.eclipse.birt.chart.device.svg,2.6.1.v20100902,"org.eclipse.birt.chart.device.svg",1294830548842 -stopped,bundle,org.eclipse.birt.chart.device.extension,2.6.1.v20100902,"org.eclipse.birt.chart.device.extension",1294830548854 -stopped,bundle,org.eclipse.birt.chart.device.swt,2.6.1.v20100812,"org.eclipse.birt.chart.device.swt",1294830548866 -stopped,bundle,org.eclipse.birt.chart.engine.extension,2.6.1.v20100902,"org.eclipse.birt.chart.engine.extension",1294830548880 -stopped,bundle,org.eclipse.linuxtools.gcov,4.1.1.201009101021,"org.eclipse.linuxtools.gcov",1294830548880 -stopped,bundle,org.eclipse.linuxtools.gprof,4.0.0.201009101021,"org.eclipse.linuxtools.gprof",1294830548880 -stopped,bundle,org.eclipse.linuxtools.dataviewers.charts,4.1.0.201009101021,"org.eclipse.linuxtools.dataviewers.charts",1294830548891 -stopped,bundle,org.eclipse.birt.chart.ui,2.6.1.v20100819,"org.eclipse.birt.chart.ui",1294830548942 -stopped,bundle,org.eclipse.linuxtools.systemtap.ui.dashboardextension,0.3.0.201009101021,"org.eclipse.linuxtools.systemtap.ui.dashboardextension",1294830548943 -stopped,bundle,org.eclipse.linuxtools.systemtap.ui.dashboard,0.3.0.201009101021,"org.eclipse.linuxtools.systemtap.ui.dashboard",1294830548951 -stopped,bundle,org.eclipse.linuxtools.systemtap.ui.graphicalrun,0.3.0.201009101021,"org.eclipse.linuxtools.systemtap.ui.graphicalrun",1294830548952 -stopped,bundle,org.eclipse.linuxtools.systemtap.ui.ide,0.3.0.201009101021,"org.eclipse.linuxtools.systemtap.ui.ide",1294830549018 -stopped,bundle,org.eclipse.linuxtools.systemtap.ui.graphing,0.3.0.201009101021,"org.eclipse.linuxtools.systemtap.ui.graphing",1294830549032 -stopped,bundle,org.eclipse.linuxtools.systemtap.ui.graphingapi.ui,0.3.0.201009101021,"org.eclipse.linuxtools.systemtap.ui.graphingapi.ui",1294830549043 -stopped,bundle,org.eclipse.birt.chart.engine,2.6.1.v20100909,"org.eclipse.birt.chart.engine",1294830549055 -stopped,bundle,org.eclipse.birt.core.ui,2.6.1.v20100812,"org.eclipse.birt.core.ui",1294830549065 -stopped,bundle,org.eclipse.birt.data.aggregation,2.6.1.v20100909,"org.eclipse.birt.data.aggregation",1294830549073 diff --git a/webkitTest/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/webkitTest/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache deleted file mode 100644 index 593f470..0000000 Binary files a/webkitTest/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache and /dev/null differ diff --git a/webkitTest/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/webkitTest/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat deleted file mode 100644 index b22acd5..0000000 Binary files a/webkitTest/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat and /dev/null differ diff --git a/webkitTest/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/webkitTest/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml deleted file mode 100644 index a4ee3cb..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/webkitTest/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/webkitTest/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml deleted file mode 100644 index 9e390f5..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/webkitTest/.metadata/.plugins/org.eclipse.ui.intro/dialog_settings.xml b/webkitTest/.metadata/.plugins/org.eclipse.ui.intro/dialog_settings.xml deleted file mode 100644 index f118f02..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.ui.intro/dialog_settings.xml +++ /dev/null @@ -1,4 +0,0 @@ - -
- -
diff --git a/webkitTest/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/webkitTest/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml deleted file mode 100644 index 5ca0b77..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - -
-
diff --git a/webkitTest/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml b/webkitTest/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml deleted file mode 100644 index 007bdb8..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/webkitTest/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/webkitTest/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml deleted file mode 100644 index 6b12691..0000000 --- a/webkitTest/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/webkitTest/.metadata/version.ini b/webkitTest/.metadata/version.ini deleted file mode 100644 index c51ff74..0000000 --- a/webkitTest/.metadata/version.ini +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.core.runtime=1 \ No newline at end of file diff --git a/webkitTest/.project b/webkitTest/.project deleted file mode 100644 index bdc6242..0000000 --- a/webkitTest/.project +++ /dev/null @@ -1,88 +0,0 @@ - - - webkitTest - - - - - - com.trolltech.qtcppproject.QtMakefileGenerator - - - - - org.eclipse.cdt.make.core.makeBuilder - clean,full,incremental, - - - org.eclipse.cdt.core.errorOutputParser - org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.MakeErrorParser; - - - org.eclipse.cdt.make.core.append_environment - true - - - org.eclipse.cdt.make.core.build.arguments - - - - org.eclipse.cdt.make.core.build.command - make - - - org.eclipse.cdt.make.core.build.target.auto - debug - - - org.eclipse.cdt.make.core.build.target.clean - clean - - - org.eclipse.cdt.make.core.build.target.inc - debug - - - org.eclipse.cdt.make.core.enableAutoBuild - false - - - org.eclipse.cdt.make.core.enableCleanBuild - true - - - org.eclipse.cdt.make.core.enableFullBuild - true - - - org.eclipse.cdt.make.core.enabledIncrementalBuild - true - - - org.eclipse.cdt.make.core.environment - PATH=/usr/local/Trolltech/QtEmbedded-4.7.1/bin:${env_var:PATH}:${env_var:PATH}| - - - org.eclipse.cdt.make.core.stopOnError - false - - - org.eclipse.cdt.make.core.useDefaultBuildCmd - false - - - - - org.eclipse.cdt.make.core.ScannerConfigBuilder - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.make.core.makeNature - org.eclipse.cdt.make.core.ScannerConfigNature - com.trolltech.qtcppproject.QtNature - - diff --git a/webkitTest/Makefile.Debug b/webkitTest/Makefile.Debug deleted file mode 100644 index 5860ea1..0000000 --- a/webkitTest/Makefile.Debug +++ /dev/null @@ -1,179 +0,0 @@ -############################################################################# -# Makefile for building: webkitTest -# Generated by qmake (2.01a) (Qt 4.7.1) on: Wed Jan 5 15:42:24 2011 -# Project: webkitTest.pro -# Template: app -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qws/linux-x86-g++ -I. -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtCore -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtNetwork -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtGui -I/usr/local/Trolltech/QtEmbedded-4.7.1/include -Idebug -I. -LINK = g++ -LFLAGS = -Wl,-rpath,/usr/local/Trolltech/QtEmbedded-4.7.1/lib -LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtNetwork -lQtCore -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/local/Trolltech/QtEmbedded-4.7.1/bin/qmake -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = debug/ - -####### Files - -SOURCES = main.cpp \ - webkittest.cpp debug/moc_webkittest.cpp -OBJECTS = debug/main.o \ - debug/webkittest.o \ - debug/moc_webkittest.o -DIST = /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/g++.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/unix.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/linux.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/qws.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qconfig.pri \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/modules/qt_webkit_version.pri \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt_functions.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt_config.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/exclusive_builds.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_pre.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/debug.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/debug_and_release.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_post.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/build_pass.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/warn_on.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/unix/thread.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/moc.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/resources.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/uic.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/yacc.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/lex.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/include_source_dir.prf \ - webkitTest.pro -QMAKE_TARGET = webkitTest -DESTDIR = -TARGET = webkitTest - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: Makefile.Debug $(TARGET) - -$(TARGET): ui_webkittest.h $(OBJECTS) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -qmake: FORCE - @$(QMAKE) CONFIG+=debug_and_release -o Makefile.Debug webkitTest.pro - -dist: - @$(CHK_DIR_EXISTS) debug/webkitTest1.0.0 || $(MKDIR) debug/webkitTest1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/webkitTest1.0.0/ && $(COPY_FILE) --parents webkittest.h debug/webkitTest1.0.0/ && $(COPY_FILE) --parents main.cpp webkittest.cpp debug/webkitTest1.0.0/ && $(COPY_FILE) --parents webkittest.ui debug/webkitTest1.0.0/ && (cd `dirname debug/webkitTest1.0.0` && $(TAR) webkitTest1.0.0.tar webkitTest1.0.0 && $(COMPRESS) webkitTest1.0.0.tar) && $(MOVE) `dirname debug/webkitTest1.0.0`/webkitTest1.0.0.tar.gz . && $(DEL_FILE) -r debug/webkitTest1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile.Debug - - -check: first - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -compiler_moc_header_make_all: debug/moc_webkittest.cpp -compiler_moc_header_clean: - -$(DEL_FILE) debug/moc_webkittest.cpp -debug/moc_webkittest.cpp: ui_webkittest.h \ - webkittest.h - /usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) webkittest.h -o debug/moc_webkittest.cpp - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: ui_webkittest.h -compiler_uic_clean: - -$(DEL_FILE) ui_webkittest.h -ui_webkittest.h: webkittest.ui - /usr/local/Trolltech/QtEmbedded-4.7.1/bin/uic webkittest.ui -o ui_webkittest.h - -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_moc_header_clean compiler_uic_clean - -####### Compile - -debug/main.o: main.cpp webkittest.h \ - ui_webkittest.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/main.o main.cpp - -debug/webkittest.o: webkittest.cpp webkittest.h \ - ui_webkittest.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/webkittest.o webkittest.cpp - -debug/moc_webkittest.o: debug/moc_webkittest.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_webkittest.o debug/moc_webkittest.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/webkitTest/Makefile.Release b/webkitTest/Makefile.Release deleted file mode 100644 index e472b76..0000000 --- a/webkitTest/Makefile.Release +++ /dev/null @@ -1,179 +0,0 @@ -############################################################################# -# Makefile for building: webkitTest -# Generated by qmake (2.01a) (Qt 4.7.1) on: Wed Jan 5 15:42:24 2011 -# Project: webkitTest.pro -# Template: app -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qws/linux-x86-g++ -I. -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtCore -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtNetwork -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtGui -I/usr/local/Trolltech/QtEmbedded-4.7.1/include -Irelease -I. -LINK = g++ -LFLAGS = -Wl,-O1 -Wl,-rpath,/usr/local/Trolltech/QtEmbedded-4.7.1/lib -LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtNetwork -lQtCore -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/local/Trolltech/QtEmbedded-4.7.1/bin/qmake -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = release/ - -####### Files - -SOURCES = main.cpp \ - webkittest.cpp release/moc_webkittest.cpp -OBJECTS = release/main.o \ - release/webkittest.o \ - release/moc_webkittest.o -DIST = /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/g++.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/unix.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/linux.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/qws.conf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qconfig.pri \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/modules/qt_webkit_version.pri \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt_functions.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt_config.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/exclusive_builds.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_pre.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/release.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/debug_and_release.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_post.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/build_pass.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/warn_on.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/unix/thread.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/moc.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/resources.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/uic.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/yacc.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/lex.prf \ - /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/include_source_dir.prf \ - webkitTest.pro -QMAKE_TARGET = webkitTest -DESTDIR = -TARGET = webkitTest - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: Makefile.Release $(TARGET) - -$(TARGET): ui_webkittest.h $(OBJECTS) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -qmake: FORCE - @$(QMAKE) CONFIG+=debug_and_release -o Makefile.Release webkitTest.pro - -dist: - @$(CHK_DIR_EXISTS) release/webkitTest1.0.0 || $(MKDIR) release/webkitTest1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) release/webkitTest1.0.0/ && $(COPY_FILE) --parents webkittest.h release/webkitTest1.0.0/ && $(COPY_FILE) --parents main.cpp webkittest.cpp release/webkitTest1.0.0/ && $(COPY_FILE) --parents webkittest.ui release/webkitTest1.0.0/ && (cd `dirname release/webkitTest1.0.0` && $(TAR) webkitTest1.0.0.tar webkitTest1.0.0 && $(COMPRESS) webkitTest1.0.0.tar) && $(MOVE) `dirname release/webkitTest1.0.0`/webkitTest1.0.0.tar.gz . && $(DEL_FILE) -r release/webkitTest1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile.Release - - -check: first - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -compiler_moc_header_make_all: release/moc_webkittest.cpp -compiler_moc_header_clean: - -$(DEL_FILE) release/moc_webkittest.cpp -release/moc_webkittest.cpp: ui_webkittest.h \ - webkittest.h - /usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) webkittest.h -o release/moc_webkittest.cpp - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: ui_webkittest.h -compiler_uic_clean: - -$(DEL_FILE) ui_webkittest.h -ui_webkittest.h: webkittest.ui - /usr/local/Trolltech/QtEmbedded-4.7.1/bin/uic webkittest.ui -o ui_webkittest.h - -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_moc_header_clean compiler_uic_clean - -####### Compile - -release/main.o: main.cpp webkittest.h \ - ui_webkittest.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/main.o main.cpp - -release/webkittest.o: webkittest.cpp webkittest.h \ - ui_webkittest.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/webkittest.o webkittest.cpp - -release/moc_webkittest.o: release/moc_webkittest.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_webkittest.o release/moc_webkittest.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/webkitTest/README b/webkitTest/README deleted file mode 100644 index 74308ad..0000000 --- a/webkitTest/README +++ /dev/null @@ -1,4 +0,0 @@ -## howto ## -qmake -make -./webkitTest -qws # make sure you have your qvfb running.. diff --git a/webkitTest/debug/main.o b/webkitTest/debug/main.o deleted file mode 100644 index ba60215..0000000 Binary files a/webkitTest/debug/main.o and /dev/null differ diff --git a/webkitTest/debug/moc_webkittest.cpp b/webkitTest/debug/moc_webkittest.cpp deleted file mode 100644 index d5f1a13..0000000 --- a/webkitTest/debug/moc_webkittest.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'webkittest.h' -** -** Created: Wed Jan 5 15:42:37 2011 -** by: The Qt Meta Object Compiler version 62 (Qt 4.7.1) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "../webkittest.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'webkittest.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 62 -#error "This file was generated using the moc from 4.7.1. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_webkitTest[] = { - - // content: - 5, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_webkitTest[] = { - "webkitTest\0" -}; - -const QMetaObject webkitTest::staticMetaObject = { - { &QWidget::staticMetaObject, qt_meta_stringdata_webkitTest, - qt_meta_data_webkitTest, 0 } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &webkitTest::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *webkitTest::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *webkitTest::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_webkitTest)) - return static_cast(const_cast< webkitTest*>(this)); - return QWidget::qt_metacast(_clname); -} - -int webkitTest::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QWidget::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/webkitTest/debug/moc_webkittest.o b/webkitTest/debug/moc_webkittest.o deleted file mode 100644 index d588634..0000000 Binary files a/webkitTest/debug/moc_webkittest.o and /dev/null differ diff --git a/webkitTest/debug/webkittest.o b/webkitTest/debug/webkittest.o deleted file mode 100644 index d4df5b4..0000000 Binary files a/webkitTest/debug/webkittest.o and /dev/null differ diff --git a/webkitTest/files b/webkitTest/files deleted file mode 100644 index 4f00564..0000000 --- a/webkitTest/files +++ /dev/null @@ -1,13 +0,0 @@ -/usr/local/Trolltech/QtEmbedded-4.7.1/lib/libQtWebKit.so.4.7.1 -/usr/local/Trolltech/QtEmbedded-4.7.1/lib/libQtGui.so.4.7.1 -/usr/local/Trolltech/QtEmbedded-4.7.1/lib/libQtNetwork.so.4.7.1 -/usr/local/Trolltech/QtEmbedded-4.7.1/lib/libQtCore.so.4.7.1 -/lib/tls/i686/cmov/libpthread-2.11.1.so -/usr/lib/libstdc++.so.6.0.13 -/lib/tls/i686/cmov/libm-2.11.1.so -/lib/tls/i686/cmov/libc-2.11.1.so -/lib/libpng12.so.0.42.0 -/lib/libz.so.1.2.3.3 -/usr/lib/libfreetype.so.6.3.22 -/lib/tls/i686/cmov/libdl-2.11.1.so -/lib/tls/i686/cmov/librt-2.11.1.so diff --git a/webkitTest/main.cpp b/webkitTest/main.cpp deleted file mode 100644 index d6ab041..0000000 --- a/webkitTest/main.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "webkittest.h" - -#include -#include - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - a.connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); - - QUrl url; - if (argc > 1) - url = QUrl(argv[1]); - else - url = QUrl("http://132.230.4.3/webkitTest.html"); - - webkitTest *w = new webkitTest(0, url); - //w.setUrl(url); - w->show(); - - return a.exec(); -} diff --git a/webkitTest/out.txt b/webkitTest/out.txt deleted file mode 100644 index 40142d0..0000000 --- a/webkitTest/out.txt +++ /dev/null @@ -1 +0,0 @@ -blub diff --git a/webkitTest/tar b/webkitTest/tar deleted file mode 100644 index e69de29..0000000 diff --git a/webkitTest/test.sh b/webkitTest/test.sh deleted file mode 100755 index f2a9e2c..0000000 --- a/webkitTest/test.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -for i in $(ldd webkitTest | awk '{print $3}' | grep lib ) -do - foo=$(dirname $i) - bar=$(readlink $i) - echo $foo/$bar >> files -done - -#| xargs tar -cf arc.tar diff --git a/webkitTest/webkitTest b/webkitTest/webkitTest deleted file mode 100755 index a0cc486..0000000 Binary files a/webkitTest/webkitTest and /dev/null differ diff --git a/webkitTest/webkitTest.pro b/webkitTest/webkitTest.pro deleted file mode 100644 index 6ecfd88..0000000 --- a/webkitTest/webkitTest.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app -TARGET = webkitTest - -QT += core gui webkit - -HEADERS += webkittest.h -SOURCES += main.cpp \ - webkittest.cpp -FORMS += webkittest.ui -RESOURCES += diff --git a/webkitTest/webkittest.cpp b/webkitTest/webkittest.cpp deleted file mode 100644 index c8d460d..0000000 --- a/webkitTest/webkittest.cpp +++ /dev/null @@ -1,58 +0,0 @@ -#include -#include -#include //needed for In/Output -#include "webkittest.h" - -webkitTest::webkitTest(QWidget *parent, QUrl & url) - : QWidget(parent) -{ - ui.setupUi(this); - this->url = url; - //define starting page - ui.webView->load(this->url); //QUrl("http://132.230.4.3/webkitTest.html") - ui.webView->show(); - - //enable JavaScript access to qt objects - QObject::connect(ui.webView->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(addJSObject())); - - //remove the window decoration - Qt::WindowFlags flags = Qt::SplashScreen; - this->setWindowFlags(flags); - - //set form to fullscreen - this->showFullScreen(); - - //set webView to the same size as the form - ui.webView->resize(this->size()); - -} - - -//enable JavaScript access to qt objects -void webkitTest::addJSObject() { - ui.webView->page()->mainFrame()->addToJavaScriptWindowObject(QString("webkitTest"), this); -} - -void webkitTest::writeText(QString text){ - QFile file("out.txt"); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) - return; - - QTextStream out(&file); - out << text << "\n"; -} -/* -void webkitTest::setQApplication(const QApplication & app){ - -} -*/ -void webkitTest::setUrl(QUrl & url){ - this->url = url; -} - -webkitTest::~webkitTest() -{ - -} - - diff --git a/webkitTest/webkittest.h b/webkitTest/webkittest.h deleted file mode 100644 index 7136976..0000000 --- a/webkitTest/webkittest.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef WEBKITTEST_H -#define WEBKITTEST_H - -#include -#include "ui_webkittest.h" - -class webkitTest : public QWidget -{ - Q_OBJECT - -public: - webkitTest(QWidget *parent, QUrl & url); - ~webkitTest(); - Q_INVOKABLE void writeText(QString text); //used for writing web content into a file - //void setQApplication(const QApplication & app); - void setUrl(QUrl & url); - -private: - Ui::webkitTestClass ui; - QApplication * app; - QUrl url; - -private slots: - void addJSObject(); -}; - -#endif // WEBKITTEST_H diff --git a/webkitTest/webkittest.ui b/webkitTest/webkittest.ui deleted file mode 100644 index 7652277..0000000 --- a/webkitTest/webkittest.ui +++ /dev/null @@ -1,42 +0,0 @@ - - - webkitTestClass - - - - 0 - 0 - 800 - 600 - - - - - - - - - 0 - 0 - 800 - 601 - - - - - about:blank - - - - - - - - QWebView - QWidget -
QtWebKit/QWebView
- - - - - -- cgit v1.2.3-55-g7522