From 1ea8daa68a8cfa425045e993ff821215e08a3c52 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Tue, 22 May 2018 16:07:53 +0200
Subject: [PATCH] Translate to qmake
---
t14/Makefile | 60 -----------------------------
t14/t14.mak | 87 ------------------------------------------
t14/{t14.p => t14.pro} | 3 +-
3 files changed, 2 insertions(+), 148 deletions(-)
delete mode 100644 t14/Makefile
delete mode 100644 t14/t14.mak
rename t14/{t14.p => t14.pro} (92%)
diff --git a/t14/Makefile b/t14/Makefile
deleted file mode 100644
index 6d0c189..0000000
--- a/t14/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-####### This section is automatically generated from
-####### /home/hanord/qt/tutorial/Makefile
-
-INCDIR = $(QTDIR)/include
-CFLAGS = -O2
-LFLAGS = -L$(QTDIR)/lib -lqt
-CC = gcc
-MOC = moc
-
-####### End of automatically generated section
-#
-# $Source: /tmp/cvs/qt/tutorial/t14/Makefile,v $
-#
-
-####### Files
-
-HEADERS = lcdrange.h cannon.h gamebrd.h
-SOURCES = lcdrange.cpp cannon.cpp gamebrd.cpp main.cpp
-OBJECTS = lcdrange.o cannon.o gamebrd.o main.o
-SRCMETA = mlcdrang.cpp mcannon.cpp mgamebr.cpp
-OBJMETA = mlcdrang.o mcannon.o mgamebr.o
-TARGET = t14
-
-####### Implicit rules
-
-.SUFFIXES: .cpp
-
-.cpp.o:
- $(CC) -c $(CFLAGS) -I$(INCDIR) $<
-
-####### Build rules
-
-all: $(TARGET)
-
-$(TARGET): $(OBJECTS) $(OBJMETA)
- $(CC) $(OBJECTS) $(OBJMETA) -o $(TARGET) $(LFLAGS) -lm
-
-depend:
- @makedepend -I$(INCDIR) $(SOURCES) 2> /dev/null
-
-showfiles:
- @echo $(HEADERS) $(SOURCES) Makefile
-
-clean:
- rm -f *.o *.bak *~ *% #*
- rm -f $(SRCMETA) $(TARGET)
-
-####### Meta classes
-
-mlcdrang.cpp: lcdrange.h
- $(MOC) -o $@ lcdrange.h
-
-mcannon.cpp: cannon.h
- $(MOC) -o $@ cannon.h
-
-mgamebr.cpp: gamebrd.h
- $(MOC) -o $@ gamebrd.h
-
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/t14/t14.mak b/t14/t14.mak
deleted file mode 100644
index 6dd251e..0000000
--- a/t14/t14.mak
+++ /dev/null
@@ -1,87 +0,0 @@
-#############################################################################
-# Generated by tmake at 15:26, 1996/10/10
-# Project: t14.p
-# Template: e:\tmake\template\win\msvc\qtapp.t
-#############################################################################
-
-####### Directories
-
-BASEDIR = $(QTDIR)
-INCDIR = $(BASEDIR)\include
-LIBDIR = $(BASEDIR)\lib
-
-####### Compiler
-
-CFLAGS = -Zi -nologo
-LFLAGS = $(LIBDIR)\qt.lib user32.lib gdi32.lib comdlg32.lib libc.lib
-CC = cl
-MOC = moc
-LINK = link /DEBUG /SUBSYSTEM:windows /NODEFAULTLIB:libcd.lib
-
-####### Files
-
-HEADERS = cannon.h \
- gamebrd.h \
- lcdrange.h
-SOURCES = cannon.cpp \
- gamebrd.cpp \
- lcdrange.cpp \
- main.cpp
-OBJECTS = cannon.obj \
- gamebrd.obj \
- lcdrange.obj \
- main.obj
-SRCMETA = moc_cannon.cpp \
- moc_gamebrd.cpp \
- moc_lcdrange.cpp
-OBJMETA = moc_cannon.obj \
- moc_gamebrd.obj \
- moc_lcdrange.obj
-TARGET = t14.exe
-
-####### Implicit rules
-
-.SUFFIXES: .cpp
-
-.cpp.obj:
- $(CC) -c $(CFLAGS) -I$(INCDIR) -Fo$@ $<
-
-####### Build rules
-
-all: $(TARGET)
-
-$(TARGET): $(OBJECTS) $(OBJMETA) $(LIBDIR)\qt.lib
- $(LINK) -OUT:$(TARGET) $(OBJECTS) $(OBJMETA) $(LFLAGS)
-
-mocify: $(SRCMETA)
-
-clean:
- del $(OBJECTS) $(OBJMETA) $(SRCMETA)
-
-####### Compile
-
-cannon.obj: cannon.cpp \
- cannon.h
-
-gamebrd.obj: gamebrd.cpp \
- gamebrd.h \
- lcdrange.h \
- cannon.h
-
-lcdrange.obj: lcdrange.cpp \
- lcdrange.h
-
-main.obj: main.cpp \
- gamebrd.h \
- lcdrange.h \
- cannon.h
-
-moc_cannon.cpp: cannon.h
- $(MOC) cannon.h -o moc_cannon.cpp
-
-moc_gamebrd.cpp: gamebrd.h
- $(MOC) gamebrd.h -o moc_gamebrd.cpp
-
-moc_lcdrange.cpp: lcdrange.h
- $(MOC) lcdrange.h -o moc_lcdrange.cpp
-
diff --git a/t14/t14.p b/t14/t14.pro
similarity index 92%
rename from t14/t14.p
rename to t14/t14.pro
index 1638f9d..820b328 100644
--- a/t14/t14.p
+++ b/t14/t14.pro
@@ -1,4 +1,5 @@
-TEMPLATE = qtapp
+QT += widgets
+
HEADERS = cannon.h \
gamebrd.h \
lcdrange.h
--
GitLab