move lib to subfolder

Author: machinekoder

cpp-qt-live-coding.pro

@@ -1,43 +1,11 @@
-TEMPLATE = lib
-TARGET = com_machinekoder_live_plugin
-QT += qml quick
-CONFIG += plugin c++11
+TEMPLATE = subdirs
 
-TARGET = $$qtLibraryTarget($$TARGET)
-uri = com.machinekoder.live
+SUBDIRS += 3rdparty lib example
 
-# Input
-SOURCES += \
-        filewatcher.cpp \
-    applicationhelpers.cpp \
-    projectbrowser.cpp \
-    cpp_qt_live_coding_plugin.cpp \
-    livewindow.cpp
+lib.depends = 3rdparty
+example.depends = lib
 
-HEADERS += \
-        filewatcher.h \
-    applicationhelpers.h \
-    projectbrowser.h \
-    cpp_qt_live_coding_plugin.h \
-    livewindow.h
-
-DISTFILES = qmldir
-
-!equals(_PRO_FILE_PWD_, $$OUT_PWD) {
-    copy_qmldir.target = $$OUT_PWD/qmldir
-    copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
-    copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
-    QMAKE_EXTRA_TARGETS += copy_qmldir
-    PRE_TARGETDEPS += $$copy_qmldir.target
+CONFIG(debug, debug|release) {
+    SUBDIRS += tests
+    tests.depends = lib
 }
-
-qmldir.files = qmldir
-unix {
-    installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
-    qmldir.path = $$installPath
-    target.path = $$installPath
-    INSTALLS += target qmldir
-}
-
-RESOURCES += \
-    qml.qrc

example/example.pro

@@ -27,3 +27,5 @@ QML_DESIGNER_IMPORT_PATH =
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
+
+INSTALLS =

example/qml.qrc

@@ -3,7 +3,6 @@
         <file>main.qml</file>
         <file>Page1Form.qml</file>
         <file>Page2Form.ui.qml</file>
-        <file>main.qml</file>
         <file>qtquickcontrols2.conf</file>
         <file>live.qml</file>
     </qresource>

FileSelectionDialog.qml renamed to lib/FileSelectionDialog.qml

@@ -0,0 +1,43 @@
+TEMPLATE = lib
+TARGET = com_machinekoder_live_plugin
+QT += qml quick
+CONFIG += plugin c++11
+
+TARGET = $$qtLibraryTarget($$TARGET)
+uri = com.machinekoder.live
+
+# Input
+SOURCES += \
+        filewatcher.cpp \
+    applicationhelpers.cpp \
+    projectbrowser.cpp \
+    cpp_qt_live_coding_plugin.cpp \
+    livewindow.cpp
+
+HEADERS += \
+        filewatcher.h \
+    applicationhelpers.h \
+    projectbrowser.h \
+    cpp_qt_live_coding_plugin.h \
+    livewindow.h
+
+DISTFILES = qmldir
+
+!equals(_PRO_FILE_PWD_, $$OUT_PWD) {
+    copy_qmldir.target = $$OUT_PWD/qmldir
+    copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
+    copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
+    QMAKE_EXTRA_TARGETS += copy_qmldir
+    PRE_TARGETDEPS += $$copy_qmldir.target
+}
+
+qmldir.files = qmldir
+unix {
+    installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+    qmldir.path = $$installPath
+    target.path = $$installPath
+    INSTALLS += target qmldir
+}
+
+RESOURCES += \
+    qml.qrc