diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
| commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
| tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /src/modules/qt_concurrent.pri | |
| parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
| parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'src/modules/qt_concurrent.pri')
| -rw-r--r-- | src/modules/qt_concurrent.pri | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/modules/qt_concurrent.pri b/src/modules/qt_concurrent.pri new file mode 100644 index 0000000000..eccec12f66 --- /dev/null +++ b/src/modules/qt_concurrent.pri @@ -0,0 +1,15 @@ +QT.concurrent.VERSION = 5.0.0 +QT.concurrent.MAJOR_VERSION = 5 +QT.concurrent.MINOR_VERSION = 0 +QT.concurrent.PATCH_VERSION = 0 + +QT.concurrent.name = QtConcurrent +QT.concurrent.bins = $$QT_MODULE_BIN_BASE +QT.concurrent.includes = $$QT_MODULE_INCLUDE_BASE/QtConcurrent +QT.concurrent.private_includes = $$QT_MODULE_INCLUDE_BASE/QtConcurrent/$$QT.concurrent.VERSION +QT.concurrent.sources = $$QT_MODULE_BASE/src/concurrent +QT.concurrent.libs = $$QT_MODULE_LIB_BASE +QT.concurrent.plugins = $$QT_MODULE_PLUGIN_BASE +QT.concurrent.imports = $$QT_MODULE_IMPORT_BASE +QT.concurrent.depends = core +QT.concurrent.DEFINES = QT_CONCURRENT_LIB |