summaryrefslogtreecommitdiffstats
path: root/projects.pro
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-29 03:08:40 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-29 03:08:40 (GMT)
commit2eb60d000f3666fc42ba2b7305ca52556497c86a (patch)
tree95e1821e89fcbfa5ccaa4bcbd5673127ee801243 /projects.pro
parent9065cdc07a6745fc269d7ec3aba457d48858267c (diff)
parent9088aeae9daf02546769377853824397458ba822 (diff)
downloadQt-2eb60d000f3666fc42ba2b7305ca52556497c86a.zip
Qt-2eb60d000f3666fc42ba2b7305ca52556497c86a.tar.gz
Qt-2eb60d000f3666fc42ba2b7305ca52556497c86a.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts: tools/qdoc3/doc.cpp
Diffstat (limited to 'projects.pro')
-rw-r--r--projects.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/projects.pro b/projects.pro
index 2596c0a..3817792 100644
--- a/projects.pro
+++ b/projects.pro
@@ -61,6 +61,7 @@ unix {
(cd config.tests/unix/mysql_r && $(MAKE) distclean); \
(cd config.tests/unix/nis && $(MAKE) distclean); \
(cd config.tests/unix/nix && $(MAKE) distclean); \
+ (cd config.tests/unix/iodbc && $(MAKE) distclean); \
(cd config.tests/unix/odbc && $(MAKE) distclean); \
(cd config.tests/unix/oci && $(MAKE) distclean); \
(cd config.tests/unix/tds && $(MAKE) distclean); \