summaryrefslogtreecommitdiffstats
path: root/projects.pro
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-01-05 15:07:30 (GMT)
committeraxis <qt-info@nokia.com>2010-01-05 15:07:30 (GMT)
commit0d92fc13baac9d354a7d3a2665ca3bb4127bd606 (patch)
tree04308596166ab753de6de705fcd80b091e4562ad /projects.pro
parent6abee18b8ab9899b909a15227fba8fbc4506fad8 (diff)
parent78474a65e4f61e9d1ae8116d5b690cf78729aa71 (diff)
downloadQt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.zip
Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.tar.gz
Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.tar.bz2
Merge branch 'merge-request-1601' into master-s60
Conflicts: bin/createpackage.pl mkspecs/features/symbian/application_icon.prf qmake/generators/symbian/symmake_abld.cpp src/gui/text/qfontdatabase_s60.cpp src/s60main/s60main.pro
Diffstat (limited to 'projects.pro')
-rw-r--r--projects.pro15
1 files changed, 13 insertions, 2 deletions
diff --git a/projects.pro b/projects.pro
index d405a5b..11cbd03 100644
--- a/projects.pro
+++ b/projects.pro
@@ -112,7 +112,8 @@ win32 {
}
symbian {
confclean.depends += distclean
- confclean.commands += \
+ win32 {
+ 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 +122,17 @@ symbian {
-$(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)