summaryrefslogtreecommitdiffstats
path: root/src/declarative/declarative.pro
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@nokia.com>2010-06-15 12:02:32 (GMT)
committerGeir Vattekar <geir.vattekar@nokia.com>2010-06-15 12:02:32 (GMT)
commitac3c3b3a19207328ffbcbdada10ef61291caba15 (patch)
treea33f216d62aa506448f7fb6cbdf7640f5f223fe0 /src/declarative/declarative.pro
parentc5b06919a8fb5d20aae41f0edf9e2ffa99eb1a8a (diff)
parenta041e4eca3467c1baa6245b6fb47def127f30f41 (diff)
downloadQt-ac3c3b3a19207328ffbcbdada10ef61291caba15.zip
Qt-ac3c3b3a19207328ffbcbdada10ef61291caba15.tar.gz
Qt-ac3c3b3a19207328ffbcbdada10ef61291caba15.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/declarative/declarative.pro')
-rw-r--r--src/declarative/declarative.pro1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 8037a16..510e7a5 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -20,7 +20,6 @@ include(../qbase.pri)
#DESTDIR=.
#modules
-include(3rdparty/3rdparty.pri)
include(util/util.pri)
include(graphicsitems/graphicsitems.pri)
include(qml/qml.pri)