diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-25 07:55:55 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-25 07:55:55 (GMT) |
| commit | acc6122892a33b845da32b1d5b30dc6852c17e73 (patch) | |
| tree | 978a84a77a6bccff08bace60d47a6b14cd9eefd2 /src/corelib/corelib.pro | |
| parent | 43eccd4e52402b9020a0cf26aa1486784f8abe0e (diff) | |
| parent | 4147a2c788c39f09ef87181768a779cb701fd2bd (diff) | |
| download | Qt-acc6122892a33b845da32b1d5b30dc6852c17e73.zip Qt-acc6122892a33b845da32b1d5b30dc6852c17e73.tar.gz Qt-acc6122892a33b845da32b1d5b30dc6852c17e73.tar.bz2 | |
Merge branch 'master' into graphics-master
Diffstat (limited to 'src/corelib/corelib.pro')
| -rw-r--r-- | src/corelib/corelib.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index f99d57f..db51d43 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -5,6 +5,7 @@ DEFINES += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000 include(../qbase.pri) +include(animation/animation.pri) include(arch/arch.pri) include(concurrent/concurrent.pri) include(global/global.pri) @@ -14,6 +15,7 @@ include(io/io.pri) include(plugin/plugin.pri) include(kernel/kernel.pri) include(codecs/codecs.pri) +include(statemachine/statemachine.pri) include(xml/xml.pri) mac|darwin:LIBS += -framework ApplicationServices |