diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 12:19:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 12:19:20 (GMT) |
| commit | 534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (patch) | |
| tree | 4dd5ef7c208534607895012ff99af03b2c553f0f /projects.pro | |
| parent | 800c9df03328db934ccadb94fe75c684ed282aa1 (diff) | |
| parent | 11084503c711f862baa4d4027a7b97cedae1034e (diff) | |
| download | Qt-534f5098c577f262b4b01d1c21cd0ec1af0f25f1.zip Qt-534f5098c577f262b4b01d1c21cd0ec1af0f25f1.tar.gz Qt-534f5098c577f262b4b01d1c21cd0ec1af0f25f1.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fixed compilation.
Re-apply licenseheader text in source files for qt4.7
Updating file with CRLF line endings for the updated header
Fix a regression in QList::mid()
Fixed bug in meego graphics system runtime switching.
Fix memory leak in QXmlQuery::setQuery.
update gitignore
remove -fno-stack-protector
Fix make confclean
Update licenseheader text in source files
doc: Fixed QTBUG-19226
doc: Fixed QTBUG-19223
doc: Remved debug code for QTBUG-18791
doc: Fixed QTBUG-18791
doc: Fixed a QML snippet reference
Diffstat (limited to 'projects.pro')
| -rw-r--r-- | projects.pro | 8 |
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) |