--- a/projects.pro Wed Jun 23 19:07:03 2010 +0300
+++ b/projects.pro Tue Jul 06 15:10:48 2010 +0300
@@ -40,6 +40,8 @@
SUBDIRS += examples
} else:isEqual(PROJECT, demos) {
SUBDIRS += demos
+ } else:isEqual(PROJECT, tests) {
+ SUBDIRS += tests
} else:isEqual(PROJECT, libs) {
include(src/src.pro)
} else:isEqual(PROJECT, docs) {
@@ -48,7 +50,7 @@
contains(QT_BUILD_PARTS, tools) {
include(translations/translations.pri) # ts targets
} else {
- !wince*:!symbian:SUBDIRS += tools/linguist/lrelease
+ !wince*:SUBDIRS += tools/linguist/lrelease
}
SUBDIRS += translations # qm build step
} else:isEqual(PROJECT, qmake) {
@@ -112,7 +114,8 @@
}
symbian {
confclean.depends += distclean
- confclean.commands += \
+ contains(QMAKE_HOST.os, "Windows") {
+ confclean.commands += \
(cd src\tools\moc && $(MAKE) distclean) $$escape_expand(\n\t) \
(cd src\tools\rcc && $(MAKE) distclean) $$escape_expand(\n\t) \
(cd src\tools\uic && $(MAKE) distclean) $$escape_expand(\n\t) \
@@ -121,7 +124,17 @@
-$(DEL_FILE) mkspecs\qconfig.pri $$escape_expand(\n\t) \
-$(DEL_FILE) .qmake.cache $$escape_expand(\n\t) \
(cd qmake && $(MAKE) distclean)
-
+ } else {
+ confclean.commands += \
+ (cd src/tools/moc && $(MAKE) distclean) $$escape_expand(\n\t) \
+ (cd src/tools/rcc && $(MAKE) distclean) $$escape_expand(\n\t) \
+ (cd src/tools/uic && $(MAKE) distclean) $$escape_expand(\n\t) \
+ -$(DEL_FILE) src/corelib/global/qconfig.h $$escape_expand(\n\t) \
+ -$(DEL_FILE) src/corelib/global/qconfig.cpp $$escape_expand(\n\t) \
+ -$(DEL_FILE) mkspecs/qconfig.pri $$escape_expand(\n\t) \
+ -$(DEL_FILE) .qmake.cache $$escape_expand(\n\t) \
+ (cd qmake && $(MAKE) distclean)
+ }
}
QMAKE_EXTRA_TARGETS += confclean
qmakeclean.commands += (cd qmake && $(MAKE) clean)