diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 23:07:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 23:07:13 (GMT) |
| commit | 8f10ca802dee1ed110f301191c4a56a85575033c (patch) | |
| tree | 4465150efc232421953b6c7f1885c7738ce1e395 /mkspecs/features/incredibuild_xge.prf | |
| parent | 01498eb9a44f3b15e517e81b309087fbbf1b93bf (diff) | |
| parent | 402da10939d1d3a5973caaf9deaef0f9f10d834a (diff) | |
| download | Qt-8f10ca802dee1ed110f301191c4a56a85575033c.zip Qt-8f10ca802dee1ed110f301191c4a56a85575033c.tar.gz Qt-8f10ca802dee1ed110f301191c4a56a85575033c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (25 commits)
Add convenience function QTextCursor::positionInBlock()
Fixed URL in Russian translation.
Designer/Resourceview: Suppress warning about QFileInfo on empty path.
optimize qstring::simplified()
Revert optimizations to QString::append
unbreak QList::append() and co. again
Implement bookmark manager widget.
optimization: use QList::reserve() and QVector::reserve()
amend "purge msvc.net and msvc2002 makespecs"
Added QPlainTextEditor::anchorAt(const QPoint &pos)
Fix memmory leak.
Fix spacing.
Prevent renaming the bookmarks menu root item, it's just a placeholder.
Fix broken set last shown pagen when the last page was about:blank.
Move launch with external app in base class.
Make sure the bookmarks menu updates on add/ remove as well.
Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.
avoid double reallocations in appending operations
avoid double reallocation in string-growing replace() case
optimize qHash() some more
...
Diffstat (limited to 'mkspecs/features/incredibuild_xge.prf')
| -rw-r--r-- | mkspecs/features/incredibuild_xge.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/incredibuild_xge.prf b/mkspecs/features/incredibuild_xge.prf index 2fce443..e241ca4 100644 --- a/mkspecs/features/incredibuild_xge.prf +++ b/mkspecs/features/incredibuild_xge.prf @@ -3,7 +3,7 @@ contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc") { # The VCPROJ generator will replace the \r\h with the coded \r\n: 
 # No other generator understands the \h - win32-msvc.net|win32-msvc2*|wince*msvc*: EOC = \$\$escape_expand(\r\h) + win32-msvc2*|wince*msvc*: EOC = \$\$escape_expand(\r\h) for(xge, INCREDIBUILD_XGE) { eval($${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$replace($${xge}.output,/,\\) $$EOC $$eval($${xge}.commands)) |