diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-04-16 15:53:01 +0100 |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2012-04-20 12:28:46 +0200 |
| commit | 735290a1af8e93cc9a5a989990308593e152d101 (patch) | |
| tree | e303c4bf7b9bc6e665686b9929e6138458219d46 | |
| parent | 9e1c3ba1d1ca8aecabe49131345e4f2210773785 (diff) | |
Add pro file structure
Change-Id: I82c697726e3689cf34c5378dc122e018d3603401
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | qthttp.pro | 23 | ||||
| -rw-r--r-- | src/qhttp/qhttp.pro | 16 | ||||
| -rw-r--r-- | src/src.pro | 3 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 3 | ||||
| -rw-r--r-- | tests/auto/qhttp/qhttp.pro | 3 | ||||
| -rw-r--r-- | tests/tests.pro | 3 |
6 files changed, 43 insertions, 8 deletions
diff --git a/qthttp.pro b/qthttp.pro new file mode 100644 index 0000000..5918772 --- /dev/null +++ b/qthttp.pro @@ -0,0 +1,23 @@ +TEMPLATE = subdirs + +module_qthttp_src.subdir = src +module_qthttp_src.target = sub-src + +#There are no examples +#module_qthttp_examples.subdir = examples +#module_qthttp_examples.target = sub-examples +#module_qthttp_examples.depends = module_qthttp_src +#!contains(QT_BUILD_PARTS,examples) { +# module_qthttp_examples.CONFIG += no_default_install no_default_target +#} + +module_qthttp_tests.subdir = tests +module_qthttp_tests.target = sub-tests +module_qthttp_tests.depends = module_qthttp_src +module_qthttp_tests.CONFIG = no_default_install +!contains(QT_BUILD_PARTS,tests):module_qthttp_tests.CONFIG += no_default_target + +SUBDIRS += module_qthttp_src \ +# module_qthttp_examples \ + module_qthttp_tests \ + diff --git a/src/qhttp/qhttp.pro b/src/qhttp/qhttp.pro index c4c0c58..1ba2c9a 100644 --- a/src/qhttp/qhttp.pro +++ b/src/qhttp/qhttp.pro @@ -1,12 +1,16 @@ -TEMPLATE = lib -CONFIG += staticlib +load(qt_module) + +TARGET = QtHttp +CONFIG += static CONFIG -= shared +QT = core network + +CONFIG += module +MODULE_PRI = ../../modules/qt_http.pri +MODULE = http -QT += network network-private +load(qt_module_config) # Input HEADERS += qhttp.h qringbuffer_p.h qhttpauthenticator_p.h SOURCES += qhttp.cpp qhttpauthenticator.cpp - -# Output -DESTDIR = "../../lib" diff --git a/src/src.pro b/src/src.pro new file mode 100644 index 0000000..97841e2 --- /dev/null +++ b/src/src.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs + +SUBDIRS += qhttp diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro new file mode 100644 index 0000000..97841e2 --- /dev/null +++ b/tests/auto/auto.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs + +SUBDIRS += qhttp diff --git a/tests/auto/qhttp/qhttp.pro b/tests/auto/qhttp/qhttp.pro index dd4f17f..55d90ac 100644 --- a/tests/auto/qhttp/qhttp.pro +++ b/tests/auto/qhttp/qhttp.pro @@ -1,9 +1,8 @@ CONFIG += testcase SOURCES += tst_qhttp.cpp INCLUDEPATH += "../../../include" -LIBS += -L../../../lib -lqhttp -QT = core network testlib +QT = core network testlib http wince*: { webFiles.files = webserver/* 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 |