summaryrefslogtreecommitdiffstats
path: root/projects.pro
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-05-17 23:09:12 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-17 23:10:18 (GMT)
commitbcec005dd1cb6eea2c2a43b681be9b56eb06fba7 (patch)
treeb426c3a515b2388c39059aa2cdc8fd409661787c /projects.pro
parent08a5b8d504e86a80488a2a13525e700b6f8b3311 (diff)
parent5e38a334b1ef46a932c8aff65a7d448b5c7df853 (diff)
downloadQt-bcec005dd1cb6eea2c2a43b681be9b56eb06fba7.zip
Qt-bcec005dd1cb6eea2c2a43b681be9b56eb06fba7.tar.gz
Qt-bcec005dd1cb6eea2c2a43b681be9b56eb06fba7.tar.bz2
Merge remote branch 'origin/4.7' into 4.8-from-4.7
Conflicts: src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/network/access/qnetworkaccessdatabackend.cpp src/xmlpatterns/expr/qevaluationcache_p.h tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qtconfig/mainwindowbase.cpp tools/qtconfig/paletteeditoradvancedbase.cpp tools/qtconfig/paletteeditoradvancedbase.ui tools/qtconfig/previewwidgetbase.ui
Diffstat (limited to 'projects.pro')
-rw-r--r--projects.pro8
1 files changed, 4 insertions, 4 deletions
diff --git a/projects.pro b/projects.pro
index 408c8e5..bf4dc5e 100644
--- a/projects.pro
+++ b/projects.pro
@@ -93,15 +93,15 @@ unix:!symbian {
(cd config.tests/x11/xshape && $(MAKE) distclean); \
(cd config.tests/x11/opengl && $(MAKE) distclean); \
$(DEL_FILE) config.tests/.qmake.cache; \
- $(DEL_FILE) src/core/global/qconfig.h; \
- $(DEL_FILE) src/core/global/qconfig.cpp; \
+ $(DEL_FILE) src/corelib/global/qconfig.h; \
+ $(DEL_FILE) src/corelib/global/qconfig.cpp; \
$(DEL_FILE) mkspecs/qconfig.pri; \
$(DEL_FILE) .qmake.cache; \
(cd qmake && $(MAKE) distclean);
}
win32 {
- confclean.commands += -$(DEL_FILE) src\\core\\global\\qconfig.h $$escape_expand(\\n\\t) \
- -$(DEL_FILE) src\\core\\global\\qconfig.cpp $$escape_expand(\\n\\t) \
+ confclean.commands += -$(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)