diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-03-12 07:39:20 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-03-12 07:39:20 (GMT) |
commit | f74c7f2399c0e427cdc715e09c8bac4813285627 (patch) | |
tree | 081b08770a43723c602bb91459e63f2ff501d787 /src/imports/imports.pro | |
parent | a8e3d5b04607ef6d6ba37090526886bac286abb0 (diff) | |
parent | 9c671ca747f5f67489b8fd12b3c752d3e86a535d (diff) | |
download | Qt-f74c7f2399c0e427cdc715e09c8bac4813285627.zip Qt-f74c7f2399c0e427cdc715e09c8bac4813285627.tar.gz Qt-f74c7f2399c0e427cdc715e09c8bac4813285627.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/imports/imports.pro')
-rw-r--r-- | src/imports/imports.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 8b47043..3886f5c 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -SUBDIRS += widgets +SUBDIRS += widgets particles contains(QT_CONFIG, webkit): SUBDIRS += webkit contains(QT_CONFIG, multimedia): SUBDIRS += multimedia |