diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-03 04:55:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-03 04:55:32 (GMT) |
| commit | f118ed2fe65fb62a8865b11b293e4910397f5964 (patch) | |
| tree | d7ea6096f64195ff47e7601cd2a1609232fe5b70 /doc | |
| parent | 5c43ab3fdc5c5bb8cf443560ffd5b48139a22a49 (diff) | |
| parent | 2b27874672bf498be65a91af95565e0c4e270e91 (diff) | |
| download | Qt-f118ed2fe65fb62a8865b11b293e4910397f5964.zip Qt-f118ed2fe65fb62a8865b11b293e4910397f5964.tar.gz Qt-f118ed2fe65fb62a8865b11b293e4910397f5964.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (119 commits)
fix DLLDESTDIR handling in nmake generator when QMAKE_POST_LINK is used
un-document semicolon-splitting of INCLUDEPATH
Fix typo in qglthreads auto test.
Add selected P1 tasks to changes file.
My 4.7.2 changes (cherry picked from commit ab38731fe5dcfaa1a7a70bc290a8856b5b01524d)
4.7.2 changes
Changes for 4.7.2
Implementation of QNetworkProxyFactory::systemProxyForQuery() for Symbian
Prevents crashing when ICO file has bad color table value
Attempt to fix symbian 3.1 and 3.2 compile break.
Changed the localized vendor name for Qt SIS packages to "Nokia"
Remove sqlite3.sis from qt.sis.
Remove sqlite3_selfsigned.sis as it is no longer usable or needed.
Revert "Fix compilation error."
Introduce new flag for splitview support in Symbian
Bump QtWebKit version to 2.0.2
Update .def files for 4.7.2.
Change to release license header.
Fix for clipping failure in OpenVG paint engine.
Don't leak ScopeChainNode's
...
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 9a46ea8..9695d84 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -1650,8 +1650,7 @@ \section1 INCLUDEPATH This variable specifies the #include directories which should be - searched when compiling the project. Use ';' or a space as the - directory separator. + searched when compiling the project. For example: |