Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

2 files changed, 16 insertions, 1 deletions

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index d040d3d..6c53242 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -2341,6 +2341,11 @@ For example:
     of this variable is typically handled by \c qmake or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
+    \section1 QMAKE_LFLAGS_RPATH
+    
+    Library paths in this definition are added to the executable at link
+    time so that the added paths will be preferentially searched at runtime.
+    
     \section1 QMAKE_LFLAGS_QT_DLL
 
     This variable contains link flags when building programs that
@@ -2667,6 +2672,16 @@ For example:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 45
 
+    \section1 QMAKE_RPATH
+
+    Is equivalent to \l QMAKE_LFLAGS_RPATH.
+
+    \section1 QMAKE_RPATHDIR
+
+    A list of library directory paths, these paths are added to the
+    executable at link time so that the paths will be preferentially
+    searched at runtime.
+
     \section1 QMAKE_RUN_CC
 
     This variable specifies the individual rule needed to build an object.
diff --git a/doc/src/frameworks-technologies/eventsandfilters.qdoc b/doc/src/frameworks-technologies/eventsandfilters.qdoc
index c769884..52d596a 100644
--- a/doc/src/frameworks-technologies/eventsandfilters.qdoc
+++ b/doc/src/frameworks-technologies/eventsandfilters.qdoc
@@ -215,7 +215,7 @@
     \l{QCoreApplication::}{postEvent()} posts the event on a queue for
     later dispatch. The next time Qt's main event loop runs, it dispatches
     all posted events, with some optimization. For example, if there are
-    several resize events, they are are compressed into one. The same
+    several resize events, they are compressed into one. The same
     applies to paint events: QWidget::update() calls
     \l{QCoreApplication::}{postEvent()}, which eliminates flickering and
     increases speed by avoiding multiple repaints.