From cfe1aefe4f3fd4836b5daf48e632a06c2f1b6da2 Mon Sep 17 00:00:00 2001
From: Konrad Rosenbaum <konrad@silmor.de>
Date: Tue, 17 Jan 2017 23:09:06 +0100
Subject: [PATCH] more qmake magic

---
 README                       |   27 ++++++++++++++++++++++++++-
 examples/examples.pro        |    3 +++
 examples/minimal/minimal.cpp |   14 ++++++++++++++
 examples/minimal/minimal.pro |    7 +++++++
 examples/minimal/xx.cpp      |   14 --------------
 examples/minimal/xx.pro      |    7 -------
 melies.pro                   |    4 ++++
 7 files changed, 54 insertions(+), 22 deletions(-)
 create mode 100644 examples/examples.pro
 create mode 100644 examples/minimal/minimal.cpp
 create mode 100644 examples/minimal/minimal.pro
 delete mode 100644 examples/minimal/xx.cpp
 delete mode 100644 examples/minimal/xx.pro
 create mode 100644 melies.pro

diff --git a/README b/README
index eeb38e8..2abd444 100644
--- a/README
+++ b/README
@@ -5,6 +5,9 @@ Melies is a GUI test toolkit for Qt5 (and Qt5 only).
 
 Currently it is only tested on Linux and only supports Widgets, not QML.
 
+WARNING: THIS IS AN ALPHA VERSION! It may malfunction, delete your programs,
+rape your cat and finally get real nasty...
+
 Copyright
 ----------
 
@@ -17,7 +20,29 @@ The picture of George Melies is public domain. See George_Melies.txt
 Building and Installing
 ------------------------
 
-?
+You need to build Melies for each supported version of Qt and for each
+platform. If your version of Qt cross-compiles you need to build twice:
+once for the host (where the utilities run) and once for the target system
+(where the tested program and Melies' plugins run).
+
+These 3 commands build and install Melies:
+
+ qmake
+ make
+ make install
+
+Melies is installed directly into the installation directory of the Qt
+version it is built for.
+
+
+Using Melies
+-------------
+
+TBD
+
+
+Notes
+------
 
 User side names:
 Director - Studio, Code generator
diff --git a/examples/examples.pro b/examples/examples.pro
new file mode 100644
index 0000000..9d6c96d
--- /dev/null
+++ b/examples/examples.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS = minimal
diff --git a/examples/minimal/minimal.cpp b/examples/minimal/minimal.cpp
new file mode 100644
index 0000000..b049cb1
--- /dev/null
+++ b/examples/minimal/minimal.cpp
@@ -0,0 +1,14 @@
+#include <QPushButton>
+#include <QApplication>
+#include <QStyleFactory>
+#include <QDebug>
+
+int main(int ac,char**av)
+{
+	QApplication a(ac,av);
+	qDebug()<<QStyleFactory::keys();
+	QPushButton p("Hello");
+	p.connect(&p,SIGNAL(clicked()),&a,SLOT(quit()));
+	p.show();
+	return a.exec();
+}
diff --git a/examples/minimal/minimal.pro b/examples/minimal/minimal.pro
new file mode 100644
index 0000000..b74d699
--- /dev/null
+++ b/examples/minimal/minimal.pro
@@ -0,0 +1,7 @@
+TARGET = minimalexample
+
+SOURCES += minimal.cpp
+
+DEFINES += GM_EXAMPLES=1
+
+QT += widgets
diff --git a/examples/minimal/xx.cpp b/examples/minimal/xx.cpp
deleted file mode 100644
index b049cb1..0000000
--- a/examples/minimal/xx.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <QPushButton>
-#include <QApplication>
-#include <QStyleFactory>
-#include <QDebug>
-
-int main(int ac,char**av)
-{
-	QApplication a(ac,av);
-	qDebug()<<QStyleFactory::keys();
-	QPushButton p("Hello");
-	p.connect(&p,SIGNAL(clicked()),&a,SLOT(quit()));
-	p.show();
-	return a.exec();
-}
diff --git a/examples/minimal/xx.pro b/examples/minimal/xx.pro
deleted file mode 100644
index 6060152..0000000
--- a/examples/minimal/xx.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET = xx
-
-SOURCES += xx.cpp
-
-DEFINES += GM_EXAMPLES=1
-
-QT += widgets
diff --git a/melies.pro b/melies.pro
new file mode 100644
index 0000000..3af04f2
--- /dev/null
+++ b/melies.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS = controller styleplugin examples
+# ... director player recorder proxy
-- 
1.7.2.5