Fix the build system. Updated pro files.

Change-Id: I990d4c4630ee293ac6a1ac234066194ed81c709e
Reviewed-by: Anselmo L. S. Melo <anselmolsm@gmail.com>

22 files changed, 9 insertions, 30 deletions

diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644
index 0000000..945b1b0
--- /dev/null
+++ b/.qmake.conf
@@ -0,0 +1,2 @@
+load(qt_build_config)
+MODULE_VERSION = $$QT_VERSION
diff --git a/src/imports/imports.pro b/imports/imports.pro
index 9818f86..9818f86 100644
--- a/src/imports/imports.pro
+++ b/imports/imports.pro
diff --git a/src/imports/models/models.pro b/imports/models/models.pro
index da65bc2..a83bade 100644
--- a/src/imports/models/models.pro
+++ b/imports/models/models.pro
@@ -12,7 +12,6 @@ SOURCES += uiquickcompletionmodel.cpp
 
 HEADERS += uiquickcompletionmodel_p.h
 
-DESTDIR = $$QT.qml.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
diff --git a/src/imports/models/plugin.cpp b/imports/models/plugin.cpp
index d2567c1..d2567c1 100644
--- a/src/imports/models/plugin.cpp
+++ b/imports/models/plugin.cpp
diff --git a/src/imports/models/qmldir b/imports/models/qmldir
index 9e4d18c..9e4d18c 100644
--- a/src/imports/models/qmldir
+++ b/imports/models/qmldir
diff --git a/src/imports/models/uiqmlmodelsplugin.json b/imports/models/uiqmlmodelsplugin.json
index 0967ef4..0967ef4 100644
--- a/src/imports/models/uiqmlmodelsplugin.json
+++ b/imports/models/uiqmlmodelsplugin.json
diff --git a/src/imports/models/uiquickcompletionmodel.cpp b/imports/models/uiquickcompletionmodel.cpp
index 9f69399..9f69399 100644
--- a/src/imports/models/uiquickcompletionmodel.cpp
+++ b/imports/models/uiquickcompletionmodel.cpp
diff --git a/src/imports/models/uiquickcompletionmodel_p.h b/imports/models/uiquickcompletionmodel_p.h
index bb50c68..bb50c68 100644
--- a/src/imports/models/uiquickcompletionmodel_p.h
+++ b/imports/models/uiquickcompletionmodel_p.h
diff --git a/src/imports/undo/plugin.cpp b/imports/undo/plugin.cpp
index d34558d..d34558d 100644
--- a/src/imports/undo/plugin.cpp
+++ b/imports/undo/plugin.cpp
diff --git a/src/imports/undo/qmldir b/imports/undo/qmldir
index e04cfa3..e04cfa3 100644
--- a/src/imports/undo/qmldir
+++ b/imports/undo/qmldir
diff --git a/src/imports/undo/uiqmlundoframeworkplugin.json b/imports/undo/uiqmlundoframeworkplugin.json
index 0967ef4..0967ef4 100644
--- a/src/imports/undo/uiqmlundoframeworkplugin.json
+++ b/imports/undo/uiqmlundoframeworkplugin.json
diff --git a/src/imports/undo/uiquickbaseundocommand.cpp b/imports/undo/uiquickbaseundocommand.cpp
index 98718a8..98718a8 100644
--- a/src/imports/undo/uiquickbaseundocommand.cpp
+++ b/imports/undo/uiquickbaseundocommand.cpp
diff --git a/src/imports/undo/uiquickbaseundocommand_p.h b/imports/undo/uiquickbaseundocommand_p.h
index 14fd93e..14fd93e 100644
--- a/src/imports/undo/uiquickbaseundocommand_p.h
+++ b/imports/undo/uiquickbaseundocommand_p.h
diff --git a/src/imports/undo/uiquickundocommand.cpp b/imports/undo/uiquickundocommand.cpp
index 27b381a..27b381a 100644
--- a/src/imports/undo/uiquickundocommand.cpp
+++ b/imports/undo/uiquickundocommand.cpp
diff --git a/src/imports/undo/uiquickundocommand_p.h b/imports/undo/uiquickundocommand_p.h
index f69c4e9..f69c4e9 100644
--- a/src/imports/undo/uiquickundocommand_p.h
+++ b/imports/undo/uiquickundocommand_p.h
diff --git a/src/imports/undo/uiquickundopropertycommand.cpp b/imports/undo/uiquickundopropertycommand.cpp
index 6f6bb30..6f6bb30 100644
--- a/src/imports/undo/uiquickundopropertycommand.cpp
+++ b/imports/undo/uiquickundopropertycommand.cpp
diff --git a/src/imports/undo/uiquickundopropertycommand_p.h b/imports/undo/uiquickundopropertycommand_p.h
index aa02c5c..aa02c5c 100644
--- a/src/imports/undo/uiquickundopropertycommand_p.h
+++ b/imports/undo/uiquickundopropertycommand_p.h
diff --git a/src/imports/undo/uiquickundostack.cpp b/imports/undo/uiquickundostack.cpp
index c8a715e..c8a715e 100644
--- a/src/imports/undo/uiquickundostack.cpp
+++ b/imports/undo/uiquickundostack.cpp
diff --git a/src/imports/undo/uiquickundostack_p.h b/imports/undo/uiquickundostack_p.h
index abd1664..abd1664 100644
--- a/src/imports/undo/uiquickundostack_p.h
+++ b/imports/undo/uiquickundostack_p.h
diff --git a/src/imports/undo/undo.pro b/imports/undo/undo.pro
index 39c7aa3..1bf778d 100644
--- a/src/imports/undo/undo.pro
+++ b/imports/undo/undo.pro
@@ -19,7 +19,6 @@ HEADERS += uiquickbaseundocommand_p.h \
            uiquickundostack_p.h
 
 
-DESTDIR = $$QT.qml.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
diff --git a/src/src.pro b/src/src.pro
index 11dcc0c..e70d567 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,13 +1,11 @@
-load(qt_module)
-
 TARGET = UiHelpers
+MODULE = uihelpers # not src, as per project file
+load(qt_module)
 QPRO_PWD   = $$PWD
-QT = core core-private gui gui-private qml-private v8-private
-CONFIG += module
-MODULE_PRI = ../modules/qt_uihelpers.pri
+QT += core core-private gui gui-private quick-private qml-private #v8-private
+
+include(../modules/qt_uihelpers.pri)
 
-MODULE = uihelpers
-load(qt_module_config)
 
 DEFINES += UIHELPERS_LIB
 DEFINES += $$quote(QT_BEGIN_MOC_NAMESPACE=\"QT_USE_NAMESPACE QT_USE_NAMESPACE_UIHELPERS\")
diff --git a/uihelpers.pro b/uihelpers.pro
index c1e84ca..0dbff78 100644
--- a/uihelpers.pro
+++ b/uihelpers.pro
@@ -1,21 +1,2 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-
-module_uihelpers_src.subdir = src
-module_uihelpers_src.target = module-uihelpers-src
-
-module_uihelpers_plugin.subdir = src/imports
-module_uihelpers_plugin.target = module-uihelpers-plugin
-
-module_uihelpers_examples.subdir = examples
-module_uihelpers_examples.target = module-uihelpers-examples
-
-module_uihelpers_tests.subdir = tests
-module_uihelpers_tests.target = module-uihelpers-tests
-module_uihelpers_tests.depends = module_uihelpers_src
-module_uihelpers_tests.CONFIG = no_default_install
-
-SUBDIRS += module_uihelpers_src \
-           module_uihelpers_plugin \
-           module_uihelpers_examples \
-           module_uihelpers_tests
+load(qt_parts)
+SUBDIRS += imports tests