Some minor movements and rename lablqt -> lablqml to fix \#35

README.md

@@ -1,25 +1,29 @@
-In this repo you can find my work about integrating OCaml and Qt. Initially, I 
-was planning to generate binding code for OCaml and Qt Widgets but I found it 
-hard to implement mostly because Qt relies on inheritance very much (we can't 
-add onClick handler for button without inheritance). Later I decided to 
-generate binding code for OCaml and [QtQuick](http://www.qt.io/qt-quick/). If 
-you really need QtWidgets you can check out 
-[mrvn's work](https://github.com/mrvn/ocaml-qt5). But I believe that QtQuick
+Let's write QML/QtQuick GUI for OCaml using *lablqml*!
+
+In this repo you can find my work about integrating OCaml and Qt. Initially, I
+planned to generate binding code for OCaml and Qt Widgets and called this
+library `lablqt`. But I found it
+hard to implement mostly because Qt relies on inheritance very much (we can't
+add onClick handler for button without inheritance). Later I decided to
+generate binding code for OCaml and [QtQuick](http://www.qt.io/qt-quick/).
+And I believe that QtQuick
 is the right way to create UI in Qt right now.
 
-So this repository should be called as `lablqtquick` or `lablqml` but I kept 
-`lablqt` for historical reasons.
+From 14th of February 2017 it's renamed from `lablqt` to `lablqml` because it
+is actually about QtQuick and not QtWidgets or Qt itself.  If
+you really need QtWidgets you can check out
+[mrvn's work](https://github.com/mrvn/ocaml-qt5).
 
 Directories mapping:
 
-* Code generator for QtQuick 2 is in `src`. It is made as ppx syntax extension
+* PPX syntax extension with code generator is in `ppx/`.
 * Library for interfacing with QtQuick 2 is in `lablqml`.
 * Demos are in `demos/`. Use `./configure && make test` to build them.
-* Demo app `qocamlbrowser` (ocamlbrowser with QtQuick instead of Tcl/Tk) is 
-located in [separate repo](https://github.com/kakadu/qocamlbrowser).
- 
-Github pages [site](http://kakadu.github.io/lablqt/) and 
+* Demo app `qocamlbrowser` (ocamlbrowser with QtQuick instead of Tcl/Tk) is
+located in [separate repo](https://github.com/kakadu/qocamlbrowser_quick).
+
+Github pages [site](http://kakadu.github.io/lablqt/) and
 [tutorial](http://kakadu.github.io/lablqt/tutorial2.html) are available.
 
-Use `./configure && make` to build it. Don't forget to install good Qt 
+Use `./configure && make` to build it. Don't forget to install `g++` and good Qt
 version (>= 5.3 I think, `./configure` will check for it, btw).

configure

@@ -91,7 +91,7 @@ echo -e "\
 all: generator lib \n\
 	\n\
 generator:\n\
-	cd $ROOT_DIR/src && \$(MAKE) all\n\
+	cd $ROOT_DIR/ppx && \$(MAKE) all\n\
 lib:\n\
 	\$(MAKE) -C $ROOT_DIR/lablqml\n\
 demos: generator lib\n\

ppx/README.md

@@ -0,0 +1,4 @@
+PPX extension for lablqml is here.
+
+Use `ocamlfind ppx_tools/rewriter ./ppx_qt test_qt/def.ml` to check generated
+OCaml and C++ code.