Move plugin source to a subdirectory

sailfishos · Jul 14, 2016 · 39a6b87 · 39a6b87
1 parent d788f0c
commit 39a6b87
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 29 deletions.
diff --git a/src/fileengine.cpp → src/plugin/fileengine.cpp b/src/fileengine.cpp → src/plugin/fileengine.cpp
diff --git a/src/fileengine.h → src/plugin/fileengine.h b/src/fileengine.h → src/plugin/fileengine.h
diff --git a/src/filemodel.cpp → src/plugin/filemodel.cpp b/src/filemodel.cpp → src/plugin/filemodel.cpp
diff --git a/src/filemodel.h → src/plugin/filemodel.h b/src/filemodel.h → src/plugin/filemodel.h
diff --git a/src/fileworker.cpp → src/plugin/fileworker.cpp b/src/fileworker.cpp → src/plugin/fileworker.cpp
diff --git a/src/fileworker.h → src/plugin/fileworker.h b/src/fileworker.h → src/plugin/fileworker.h
diff --git a/src/plugin.cpp → src/plugin/plugin.cpp b/src/plugin.cpp → src/plugin/plugin.cpp
diff --git a/src/plugin/plugin.pro b/src/plugin/plugin.pro
@@ -0,0 +1,29 @@
+TARGET = nemofilemanager
+PLUGIN_IMPORT_PATH = Nemo/FileManager
+
+TEMPLATE = lib
+CONFIG += qt plugin hide_symbols c++11
+QT += qml
+
+CONFIG += link_pkgconfig
+PKGCONFIG += contactcache-qt5
+
+# Drop any library linkage we dont actually need (such as contactcache-qt5)
+QMAKE_LFLAGS *= -Wl,--as-needed
+
+target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
+INSTALLS += target
+
+qmldir.files += $$_PRO_FILE_PWD_/qmldir
+qmldir.path +=  $$target.path
+INSTALLS += qmldir
+
+SOURCES += plugin.cpp filemodel.cpp fileengine.cpp \
+           fileworker.cpp statfileinfo.cpp
+
+HEADERS += filemodel.h fileengine.h fileworker.h \
+           statfileinfo.h
+
+INCLUDEPATH += $$PWD
+
+OTHER_FILES += ../../example/*/*.qml
diff --git a/src/qmldir → src/plugin/qmldir b/src/qmldir → src/plugin/qmldir
diff --git a/src/statfileinfo.cpp → src/plugin/statfileinfo.cpp b/src/statfileinfo.cpp → src/plugin/statfileinfo.cpp
diff --git a/src/statfileinfo.h → src/plugin/statfileinfo.h b/src/statfileinfo.h → src/plugin/statfileinfo.h
diff --git a/src/src.pro b/src/src.pro
@@ -1,29 +1,2 @@
-TARGET = nemofilemanager
-PLUGIN_IMPORT_PATH = Nemo/FileManager
-
-TEMPLATE = lib
-CONFIG += qt plugin hide_symbols c++11
-QT += qml
-
-CONFIG += link_pkgconfig
-PKGCONFIG += contactcache-qt5
-
-# Drop any library linkage we don't actually need (such as contactcache-qt5)
-QMAKE_LFLAGS *= -Wl,--as-needed
-
-target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
-INSTALLS += target
-
-qmldir.files += $$_PRO_FILE_PWD_/qmldir
-qmldir.path +=  $$target.path
-INSTALLS += qmldir
-
-SOURCES += plugin.cpp filemodel.cpp fileengine.cpp \
-           fileworker.cpp statfileinfo.cpp
-
-HEADERS += filemodel.h fileengine.h fileworker.h \
-           statfileinfo.h
-
-INCLUDEPATH += $$PWD
-
-OTHER_FILES += ../example/*/*.qml
+TEMPLATE = subdirs
+SUBDIRS = plugin