Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public

10 files changed, 18 insertions, 9 deletions

diff --git a/doc/src/snippets/qmake/comments.pro b/doc/src/snippets/qmake/comments.pro
index 189d271..390444b 100644
--- a/doc/src/snippets/qmake/comments.pro
+++ b/doc/src/snippets/qmake/comments.pro
@@ -5,6 +5,6 @@
 
 #! [1]
 # To include a literal hash character, use the $$LITERAL_HASH variable:
-urlPieces = http://doc.trolltech.com/4.0/qtextdocument.html pageCount
+urlPieces = http://qt.nokia.com/doc/4.0/qtextdocument.html pageCount
 message($$join(urlPieces, $$LITERAL_HASH))
 #! [1]
diff --git a/doc/src/snippets/qmake/delegate.h b/doc/src/snippets/qmake/delegate.h
index dafc47a..43e1970 100644
--- a/doc/src/snippets/qmake/delegate.h
+++ b/doc/src/snippets/qmake/delegate.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/snippets/qmake/main.cpp b/doc/src/snippets/qmake/main.cpp
index dafc47a..43e1970 100644
--- a/doc/src/snippets/qmake/main.cpp
+++ b/doc/src/snippets/qmake/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/snippets/qmake/model.cpp b/doc/src/snippets/qmake/model.cpp
index dafc47a..43e1970 100644
--- a/doc/src/snippets/qmake/model.cpp
+++ b/doc/src/snippets/qmake/model.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/snippets/qmake/model.h b/doc/src/snippets/qmake/model.h
index dafc47a..43e1970 100644
--- a/doc/src/snippets/qmake/model.h
+++ b/doc/src/snippets/qmake/model.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/snippets/qmake/paintwidget_mac.cpp b/doc/src/snippets/qmake/paintwidget_mac.cpp
index dafc47a..43e1970 100644
--- a/doc/src/snippets/qmake/paintwidget_mac.cpp
+++ b/doc/src/snippets/qmake/paintwidget_mac.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/snippets/qmake/paintwidget_unix.cpp b/doc/src/snippets/qmake/paintwidget_unix.cpp
index 2f9703c..5ed33df 100644
--- a/doc/src/snippets/qmake/paintwidget_unix.cpp
+++ b/doc/src/snippets/qmake/paintwidget_unix.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/snippets/qmake/paintwidget_win.cpp b/doc/src/snippets/qmake/paintwidget_win.cpp
index dafc47a..43e1970 100644
--- a/doc/src/snippets/qmake/paintwidget_win.cpp
+++ b/doc/src/snippets/qmake/paintwidget_win.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/doc/src/snippets/qmake/spaces.pro b/doc/src/snippets/qmake/spaces.pro
new file mode 100644
index 0000000..544ef05
--- /dev/null
+++ b/doc/src/snippets/qmake/spaces.pro
@@ -0,0 +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
+#! [quoting library paths with spaces]
+
+#! [quoting include paths with spaces]
+win32:INCLUDEPATH += $$quote(C:/mylibs/extra headers)
+unix:INCLUDEPATH += $$quote(/home/user/extra headers)
+#! [quoting include paths with spaces]
diff --git a/doc/src/snippets/qmake/view.h b/doc/src/snippets/qmake/view.h
index dafc47a..43e1970 100644
--- a/doc/src/snippets/qmake/view.h
+++ b/doc/src/snippets/qmake/view.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/