diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-02 13:04:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-02 13:04:40 (GMT) |
| commit | ef0fb5a95971285ed60530bf399c7eb038bf2977 (patch) | |
| tree | 75ce5fb1ec73a85fd73e61c3c25c47c62c46d95a /doc/src/snippets | |
| parent | e6a1cbed3f72cd41110e40c606acb27a1020644e (diff) | |
| parent | 5e3c49d86feb33f3b722760ceaf002664341cb10 (diff) | |
| download | Qt-ef0fb5a95971285ed60530bf399c7eb038bf2977.zip Qt-ef0fb5a95971285ed60530bf399c7eb038bf2977.tar.gz Qt-ef0fb5a95971285ed60530bf399c7eb038bf2977.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qdoc3: Fix compilation with -no-stl
don't add extraneous empty command lines
make the $$quote() function less prominent
minor cleanup of the QMAKE_POST_LINK command line construction
silence qmake warning about unbalanced parentheses
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/qmake/spaces.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/snippets/qmake/spaces.pro b/doc/src/snippets/qmake/spaces.pro index 544ef05..614d4c5 100644 --- a/doc/src/snippets/qmake/spaces.pro +++ b/doc/src/snippets/qmake/spaces.pro @@ -1,9 +1,9 @@ #! [quoting library paths with spaces] -win32:LIBS += $$quote(C:/mylibs/extra libs/extra.lib) -unix:LIBS += $$quote(-L/home/user/extra libs) -lextra +win32:LIBS += "C:/mylibs/extra libs/extra.lib" +unix:LIBS += "-L/home/user/extra libs" -lextra #! [quoting library paths with spaces] #! [quoting include paths with spaces] -win32:INCLUDEPATH += $$quote(C:/mylibs/extra headers) -unix:INCLUDEPATH += $$quote(/home/user/extra headers) +win32:INCLUDEPATH += "C:/mylibs/extra headers" +unix:INCLUDEPATH += "/home/user/extra headers" #! [quoting include paths with spaces] |