From 7cf01577c238f65e9585f65a049fa0625edc4352 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Mon, 16 Apr 2012 15:53:01 +0100 Subject: [PATCH] Add pro file structure Change-Id: I82c697726e3689cf34c5378dc122e018d3603401 Reviewed-by: Thiago Macieira --- .gitignore | 2 ++ examples/examples.pro | 3 +++ qtftp.pro | 22 ++++++++++++++++++++++ src/qftp/qftp.pro | 18 +++++++++++------- src/src.pro | 3 +++ tests/auto/auto.pro | 3 +++ tests/tests.pro | 3 +++ 7 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 examples/examples.pro create mode 100644 qtftp.pro create mode 100644 src/src.pro create mode 100644 tests/auto/auto.pro create mode 100644 tests/tests.pro 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 -CONFIG -= shared +load(qt_module) -QT += network +TARGET = QtFtp +CONFIG += static +CONFIG -= shared +QT = core network + +CONFIG += module +MODULE_PRI = ../../modules/qt_ftp.pri +MODULE = ftp + +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