From: Jukka Saastamoinen Date: Mon, 29 Mar 2010 09:50:23 +0000 (+0300) Subject: Created my own branch, added test script to it. X-Git-Tag: v0.2~76 X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=724efe5f1c2877fd6c5095dceb319e7929805d0d;p=situare Created my own branch, added test script to it. --- diff --git a/Makefile b/Makefile deleted file mode 100644 index 2e47ba7..0000000 --- a/Makefile +++ /dev/null @@ -1,210 +0,0 @@ -############################################################################# -# Makefile for building: Situare -# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri Mar 26 10:35:39 2010 -# Project: Situare.pro -# Template: app -# Command: /home/lampehe-local/qtsdk-2010.02/qt/bin/qmake -spec ../../qtsdk-2010.02/qt/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile Situare.pro -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I../../qtsdk-2010.02/qt/mkspecs/linux-g++ -I. -I../../qtsdk-2010.02/qt/include/QtCore -I../../qtsdk-2010.02/qt/include/QtGui -I../../qtsdk-2010.02/qt/include -I. -LINK = g++ -LFLAGS = -Wl,-rpath,/home/lampehe-local/qtsdk-2010.02/qt/lib -LIBS = $(SUBLIBS) -L/home/lampehe-local/qtsdk-2010.02/qt/lib -lQtGui -L/home/lampehe-local/qtsdk-2010.02/qt/lib -L/usr/X11R6/lib -lQtCore -lpthread -AR = ar cqs -RANLIB = -QMAKE = /home/lampehe-local/qtsdk-2010.02/qt/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 = ./ - -####### Files - -SOURCES = src/main.cpp \ - src/ui/mainwindow.cpp moc_mainwindow.cpp -OBJECTS = main.o \ - mainwindow.o \ - moc_mainwindow.o -DIST = ../../qtsdk-2010.02/qt/mkspecs/common/g++.conf \ - ../../qtsdk-2010.02/qt/mkspecs/common/unix.conf \ - ../../qtsdk-2010.02/qt/mkspecs/common/linux.conf \ - ../../qtsdk-2010.02/qt/mkspecs/qconfig.pri \ - ../../qtsdk-2010.02/qt/mkspecs/features/qt_functions.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/qt_config.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/exclusive_builds.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/default_pre.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/debug.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/default_post.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/warn_on.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/qt.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/unix/thread.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/moc.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/resources.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/uic.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/yacc.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/lex.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/include_source_dir.prf \ - Situare.pro -QMAKE_TARGET = Situare -DESTDIR = -TARGET = Situare - -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 $(TARGET) - -$(TARGET): $(OBJECTS) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -Makefile: Situare.pro ../../qtsdk-2010.02/qt/mkspecs/linux-g++/qmake.conf ../../qtsdk-2010.02/qt/mkspecs/common/g++.conf \ - ../../qtsdk-2010.02/qt/mkspecs/common/unix.conf \ - ../../qtsdk-2010.02/qt/mkspecs/common/linux.conf \ - ../../qtsdk-2010.02/qt/mkspecs/qconfig.pri \ - ../../qtsdk-2010.02/qt/mkspecs/features/qt_functions.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/qt_config.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/exclusive_builds.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/default_pre.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/debug.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/default_post.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/warn_on.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/qt.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/unix/thread.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/moc.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/resources.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/uic.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/yacc.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/lex.prf \ - ../../qtsdk-2010.02/qt/mkspecs/features/include_source_dir.prf \ - /home/lampehe-local/qtsdk-2010.02/qt/lib/libQtGui.prl \ - /home/lampehe-local/qtsdk-2010.02/qt/lib/libQtCore.prl - $(QMAKE) -spec ../../qtsdk-2010.02/qt/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile Situare.pro -../../qtsdk-2010.02/qt/mkspecs/common/g++.conf: -../../qtsdk-2010.02/qt/mkspecs/common/unix.conf: -../../qtsdk-2010.02/qt/mkspecs/common/linux.conf: -../../qtsdk-2010.02/qt/mkspecs/qconfig.pri: -../../qtsdk-2010.02/qt/mkspecs/features/qt_functions.prf: -../../qtsdk-2010.02/qt/mkspecs/features/qt_config.prf: -../../qtsdk-2010.02/qt/mkspecs/features/exclusive_builds.prf: -../../qtsdk-2010.02/qt/mkspecs/features/default_pre.prf: -../../qtsdk-2010.02/qt/mkspecs/features/debug.prf: -../../qtsdk-2010.02/qt/mkspecs/features/default_post.prf: -../../qtsdk-2010.02/qt/mkspecs/features/warn_on.prf: -../../qtsdk-2010.02/qt/mkspecs/features/qt.prf: -../../qtsdk-2010.02/qt/mkspecs/features/unix/thread.prf: -../../qtsdk-2010.02/qt/mkspecs/features/moc.prf: -../../qtsdk-2010.02/qt/mkspecs/features/resources.prf: -../../qtsdk-2010.02/qt/mkspecs/features/uic.prf: -../../qtsdk-2010.02/qt/mkspecs/features/yacc.prf: -../../qtsdk-2010.02/qt/mkspecs/features/lex.prf: -../../qtsdk-2010.02/qt/mkspecs/features/include_source_dir.prf: -/home/lampehe-local/qtsdk-2010.02/qt/lib/libQtGui.prl: -/home/lampehe-local/qtsdk-2010.02/qt/lib/libQtCore.prl: -qmake: FORCE - @$(QMAKE) -spec ../../qtsdk-2010.02/qt/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile Situare.pro - -dist: - @$(CHK_DIR_EXISTS) .tmp/Situare1.0.0 || $(MKDIR) .tmp/Situare1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Situare1.0.0/ && $(COPY_FILE) --parents src/ui/mainwindow.h .tmp/Situare1.0.0/ && $(COPY_FILE) --parents src/main.cpp src/ui/mainwindow.cpp .tmp/Situare1.0.0/ && (cd `dirname .tmp/Situare1.0.0` && $(TAR) Situare1.0.0.tar Situare1.0.0 && $(COMPRESS) Situare1.0.0.tar) && $(MOVE) `dirname .tmp/Situare1.0.0`/Situare1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Situare1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile - - -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: moc_mainwindow.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_mainwindow.cpp -moc_mainwindow.cpp: src/ui/mainwindow.h - /home/lampehe-local/qtsdk-2010.02/qt/bin/moc $(DEFINES) $(INCPATH) src/ui/mainwindow.h -o moc_mainwindow.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: -compiler_uic_clean: -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 - -####### Compile - -main.o: src/main.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o src/main.cpp - -mainwindow.o: src/ui/mainwindow.cpp src/ui/mainwindow.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o src/ui/mainwindow.cpp - -moc_mainwindow.o: moc_mainwindow.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/Situare.pro b/Situare.pro deleted file mode 100644 index 26f1ef4..0000000 --- a/Situare.pro +++ /dev/null @@ -1,14 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2010-03-26T07:57:35 -# -#------------------------------------------------- - -TARGET = Situare -TEMPLATE = app - - -SOURCES += src/main.cpp\ - src/ui/mainwindow.cpp - -HEADERS += src/ui/mainwindow.h diff --git a/tests/testUI/Makefile b/tests/testUI/Makefile deleted file mode 100644 index 199bad7..0000000 --- a/tests/testUI/Makefile +++ /dev/null @@ -1,221 +0,0 @@ -############################################################################# -# Makefile for building: testUI -# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri Mar 26 11:22:21 2010 -# Project: testUI.pro -# Template: app -# Command: /home/lampehe-local/qtsdk-2010.02/qt/bin/qmake -unix -o Makefile testUI.pro -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I../../../../qtsdk-2010.02/qt/mkspecs/linux-g++ -I. -I../../../../qtsdk-2010.02/qt/include/QtCore -I../../../../qtsdk-2010.02/qt/include/QtGui -I../../../../qtsdk-2010.02/qt/include -I../../../../qtsdk-2010.02/qt/include/QtTest -I. -I. -LINK = g++ -LFLAGS = -Wl,-O1 -Wl,-rpath,/home/lampehe-local/qtsdk-2010.02/qt/lib -LIBS = $(SUBLIBS) -L/home/lampehe-local/qtsdk-2010.02/qt/lib -lQtTest -L/home/lampehe-local/qtsdk-2010.02/qt/lib -lQtGui -L/usr/X11R6/lib -lQtCore -lpthread -AR = ar cqs -RANLIB = -QMAKE = /home/lampehe-local/qtsdk-2010.02/qt/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 = ./ - -####### Files - -SOURCES = testui.cpp \ - ../../src/ui/mainwindow.cpp moc_mainwindow.cpp -OBJECTS = testui.o \ - mainwindow.o \ - moc_mainwindow.o -DIST = ../../../../qtsdk-2010.02/qt/mkspecs/common/g++.conf \ - ../../../../qtsdk-2010.02/qt/mkspecs/common/unix.conf \ - ../../../../qtsdk-2010.02/qt/mkspecs/common/linux.conf \ - ../../../../qtsdk-2010.02/qt/mkspecs/qconfig.pri \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/qt_functions.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/qt_config.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/exclusive_builds.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/default_pre.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/release.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/default_post.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/qtestlib.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/warn_on.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/qt.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/unix/thread.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/moc.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/resources.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/uic.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/yacc.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/lex.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/include_source_dir.prf \ - testUI.pro -QMAKE_TARGET = testUI -DESTDIR = -TARGET = testUI - -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 $(TARGET) - -$(TARGET): $(OBJECTS) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -Makefile: testUI.pro ../../../../qtsdk-2010.02/qt/mkspecs/linux-g++/qmake.conf ../../../../qtsdk-2010.02/qt/mkspecs/common/g++.conf \ - ../../../../qtsdk-2010.02/qt/mkspecs/common/unix.conf \ - ../../../../qtsdk-2010.02/qt/mkspecs/common/linux.conf \ - ../../../../qtsdk-2010.02/qt/mkspecs/qconfig.pri \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/qt_functions.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/qt_config.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/exclusive_builds.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/default_pre.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/release.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/default_post.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/qtestlib.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/warn_on.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/qt.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/unix/thread.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/moc.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/resources.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/uic.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/yacc.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/lex.prf \ - ../../../../qtsdk-2010.02/qt/mkspecs/features/include_source_dir.prf \ - /home/lampehe-local/qtsdk-2010.02/qt/lib/libQtTest.prl \ - /home/lampehe-local/qtsdk-2010.02/qt/lib/libQtCore.prl \ - /home/lampehe-local/qtsdk-2010.02/qt/lib/libQtGui.prl - $(QMAKE) -unix -o Makefile testUI.pro -../../../../qtsdk-2010.02/qt/mkspecs/common/g++.conf: -../../../../qtsdk-2010.02/qt/mkspecs/common/unix.conf: -../../../../qtsdk-2010.02/qt/mkspecs/common/linux.conf: -../../../../qtsdk-2010.02/qt/mkspecs/qconfig.pri: -../../../../qtsdk-2010.02/qt/mkspecs/features/qt_functions.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/qt_config.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/exclusive_builds.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/default_pre.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/release.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/default_post.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/qtestlib.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/warn_on.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/qt.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/unix/thread.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/moc.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/resources.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/uic.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/yacc.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/lex.prf: -../../../../qtsdk-2010.02/qt/mkspecs/features/include_source_dir.prf: -/home/lampehe-local/qtsdk-2010.02/qt/lib/libQtTest.prl: -/home/lampehe-local/qtsdk-2010.02/qt/lib/libQtCore.prl: -/home/lampehe-local/qtsdk-2010.02/qt/lib/libQtGui.prl: -qmake: FORCE - @$(QMAKE) -unix -o Makefile testUI.pro - -dist: - @$(CHK_DIR_EXISTS) .tmp/testUI1.0.0 || $(MKDIR) .tmp/testUI1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/testUI1.0.0/ && $(COPY_FILE) --parents ../../src/ui/mainwindow.h testui.moc .tmp/testUI1.0.0/ && $(COPY_FILE) --parents testui.cpp ../../src/ui/mainwindow.cpp .tmp/testUI1.0.0/ && (cd `dirname .tmp/testUI1.0.0` && $(TAR) testUI1.0.0.tar testUI1.0.0 && $(COMPRESS) testUI1.0.0.tar) && $(MOVE) `dirname .tmp/testUI1.0.0`/testUI1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/testUI1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) Makefile - - -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: moc_mainwindow.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_mainwindow.cpp -moc_mainwindow.cpp: ../../src/ui/mainwindow.h - /home/lampehe-local/qtsdk-2010.02/qt/bin/moc $(DEFINES) $(INCPATH) ../../src/ui/mainwindow.h -o moc_mainwindow.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: testui.moc -compiler_moc_source_clean: - -$(DEL_FILE) testui.moc -testui.moc: ../../src/ui/mainwindow.h \ - testui.cpp - /home/lampehe-local/qtsdk-2010.02/qt/bin/moc $(DEFINES) $(INCPATH) testui.cpp -o testui.moc - -compiler_uic_make_all: -compiler_uic_clean: -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_moc_source_clean - -####### Compile - -testui.o: testui.cpp ../../src/ui/mainwindow.h \ - testui.moc - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o testui.o testui.cpp - -mainwindow.o: ../../src/ui/mainwindow.cpp ../../src/ui/mainwindow.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o ../../src/ui/mainwindow.cpp - -moc_mainwindow.o: moc_mainwindow.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/tests/testUI/moc_mainwindow.cpp b/tests/testUI/moc_mainwindow.cpp deleted file mode 100644 index 2fd4838..0000000 --- a/tests/testUI/moc_mainwindow.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'mainwindow.h' -** -** Created: Fri Mar 26 11:03:22 2010 -** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "../../src/ui/mainwindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'mainwindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 62 -#error "This file was generated using the moc from 4.6.2. 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_MainWindow[] = { - - // content: - 4, // 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_MainWindow[] = { - "MainWindow\0" -}; - -const QMetaObject MainWindow::staticMetaObject = { - { &QMainWindow::staticMetaObject, qt_meta_stringdata_MainWindow, - qt_meta_data_MainWindow, 0 } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &MainWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *MainWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *MainWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_MainWindow)) - return static_cast(const_cast< MainWindow*>(this)); - return QMainWindow::qt_metacast(_clname); -} - -int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QMainWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/tests/testUI/testUI b/tests/testUI/testUI deleted file mode 100755 index 206a7ba..0000000 Binary files a/tests/testUI/testUI and /dev/null differ diff --git a/tests/testUI/testUI.pro b/tests/testUI/testUI.pro index 405e8f4..6bf6f86 100644 --- a/tests/testUI/testUI.pro +++ b/tests/testUI/testUI.pro @@ -1,13 +1,13 @@ ###################################################################### -# Automatically generated by qmake (2.01a) Fri Mar 26 11:22:18 2010 +# Automatically generated by qmake (2.01a) Mon Mar 29 12:37:37 2010 ###################################################################### -CONFIG += qtestlib +CONFIG+=qtestlib TEMPLATE = app TARGET = DEPENDPATH += . INCLUDEPATH += . # Input -HEADERS += ../../src/ui/mainwindow.h testui.moc +HEADERS += ../../src/ui/mainwindow.h SOURCES += testui.cpp ../../src/ui/mainwindow.cpp diff --git a/tests/testUI/testui.cpp b/tests/testUI/testui.cpp index 651ee5d..c8e05d7 100755 --- a/tests/testUI/testui.cpp +++ b/tests/testUI/testui.cpp @@ -37,7 +37,7 @@ void TestUi::testUi() { QLineEdit lineEdit; - QTest::keyClicks(&lineEdit, "UI test"); + QTest::keyClicks(&lineEdit, "UI tests"); QCOMPARE(lineEdit.text(), QString("UI test")); } diff --git a/tests/testUI/testui.moc b/tests/testUI/testui.moc deleted file mode 100644 index ee64298..0000000 --- a/tests/testUI/testui.moc +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'testui.cpp' -** -** Created: Fri Mar 26 11:22:23 2010 -** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'testui.cpp' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 62 -#error "This file was generated using the moc from 4.6.2. 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_TestUi[] = { - - // content: - 4, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 8, 7, 7, 7, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_TestUi[] = { - "TestUi\0\0testUi()\0" -}; - -const QMetaObject TestUi::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_TestUi, - qt_meta_data_TestUi, 0 } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &TestUi::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *TestUi::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *TestUi::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_TestUi)) - return static_cast(const_cast< TestUi*>(this)); - return QObject::qt_metacast(_clname); -} - -int TestUi::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - switch (_id) { - case 0: testUi(); break; - default: ; - } - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE