summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <ext-shane.2.kearns@nokia.com>2012-04-16 15:53:01 +0100
committerShane Kearns <shane.kearns@accenture.com>2012-04-20 12:18:07 +0200
commit7cf01577c238f65e9585f65a049fa0625edc4352 (patch)
treec4d461214f810e438522bd5f5fea6e613d5507ba
parent3235eedfa40b948de39566aa85c324ee0a9efaae (diff)
Add pro file structure
Change-Id: I82c697726e3689cf34c5378dc122e018d3603401 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--.gitignore2
-rw-r--r--examples/examples.pro3
-rw-r--r--qtftp.pro22
-rw-r--r--src/qftp/qftp.pro16
-rw-r--r--src/src.pro3
-rw-r--r--tests/auto/auto.pro3
-rw-r--r--tests/tests.pro3
7 files changed, 46 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 7a872c1..21cf9a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,6 +120,8 @@ translations/*.qm
translations/*_untranslated.ts
qrc_*.cpp
+src/qftp/qtftpversion.h
+
# Test generated files
QObject.log
tst_*
diff --git a/examples/examples.pro b/examples/examples.pro
new file mode 100644
index 0000000..1172fc2
--- /dev/null
+++ b/examples/examples.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS += qftp
diff --git a/qtftp.pro b/qtftp.pro
new file mode 100644
index 0000000..b1428a3
--- /dev/null
+++ b/qtftp.pro
@@ -0,0 +1,22 @@
+TEMPLATE = subdirs
+
+module_qtftp_src.subdir = src
+module_qtftp_src.target = sub-src
+
+module_qtftp_examples.subdir = examples
+module_qtftp_examples.target = sub-examples
+module_qtftp_examples.depends = module_qtftp_src
+!contains(QT_BUILD_PARTS,examples) {
+ module_qtftp_examples.CONFIG += no_default_install no_default_target
+}
+
+module_qtftp_tests.subdir = tests
+module_qtftp_tests.target = sub-tests
+module_qtftp_tests.depends = module_qtftp_src
+module_qtftp_tests.CONFIG = no_default_install
+!contains(QT_BUILD_PARTS,tests):module_qtftp_tests.CONFIG += no_default_target
+
+SUBDIRS += module_qtftp_src \
+ module_qtftp_examples \
+ module_qtftp_tests \
+
diff --git a/src/qftp/qftp.pro b/src/qftp/qftp.pro
index e043171..1e11519 100644
--- a/src/qftp/qftp.pro
+++ b/src/qftp/qftp.pro
@@ -1,12 +1,16 @@
-TEMPLATE = lib
-CONFIG += staticlib
+load(qt_module)
+
+TARGET = QtFtp
+CONFIG += static
CONFIG -= shared
+QT = core network
+
+CONFIG += module
+MODULE_PRI = ../../modules/qt_ftp.pri
+MODULE = ftp
-QT += network
+load(qt_module_config)
# Input
HEADERS += qftp.h
SOURCES += qftp.cpp
-
-# Output
-DESTDIR = "../../lib"
diff --git a/src/src.pro b/src/src.pro
new file mode 100644
index 0000000..1172fc2
--- /dev/null
+++ b/src/src.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS += qftp
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
new file mode 100644
index 0000000..1172fc2
--- /dev/null
+++ b/tests/auto/auto.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS += qftp
diff --git a/tests/tests.pro b/tests/tests.pro
new file mode 100644
index 0000000..f927700
--- /dev/null
+++ b/tests/tests.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS += auto