Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend

Conflicts:
	configure
	src/script/qscriptarray_p.h
	src/script/qscriptasm.cpp
	src/script/qscriptasm_p.h
	src/script/qscriptbuffer_p.h
	src/script/qscriptclass.cpp
	src/script/qscriptclassdata.cpp
	src/script/qscriptclassdata_p.h
	src/script/qscriptclassinfo_p.h
	src/script/qscriptclasspropertyiterator_p.h
	src/script/qscriptcompiler.cpp
	src/script/qscriptcompiler_p.h
	src/script/qscriptcontext_p.cpp
	src/script/qscriptcontext_p.h
	src/script/qscriptcontextfwd_p.h
	src/script/qscriptcontextinfo_p.h
	src/script/qscriptecmaarray.cpp
	src/script/qscriptecmaarray_p.h
	src/script/qscriptecmaboolean.cpp
	src/script/qscriptecmaboolean_p.h
	src/script/qscriptecmacore.cpp
	src/script/qscriptecmacore_p.h
	src/script/qscriptecmadate.cpp
	src/script/qscriptecmadate_p.h
	src/script/qscriptecmaerror.cpp
	src/script/qscriptecmaerror_p.h
	src/script/qscriptecmafunction.cpp
	src/script/qscriptecmafunction_p.h
	src/script/qscriptecmaglobal.cpp
	src/script/qscriptecmaglobal_p.h
	src/script/qscriptecmamath.cpp
	src/script/qscriptecmamath_p.h
	src/script/qscriptecmanumber.cpp
	src/script/qscriptecmanumber_p.h
	src/script/qscriptecmaobject.cpp
	src/script/qscriptecmaobject_p.h
	src/script/qscriptecmaregexp.cpp
	src/script/qscriptecmaregexp_p.h
	src/script/qscriptecmastring.cpp
	src/script/qscriptecmastring_p.h
	src/script/qscriptengine.cpp
	src/script/qscriptengine_p.cpp
	src/script/qscriptengine_p.h
	src/script/qscriptengineagent_p.h
	src/script/qscriptenginefwd_p.h
	src/script/qscriptextenumeration.cpp
	src/script/qscriptextenumeration_p.h
	src/script/qscriptextqobject.cpp
	src/script/qscriptextqobject_p.h
	src/script/qscriptextvariant.cpp
	src/script/qscriptextvariant_p.h
	src/script/qscriptfunction.cpp
	src/script/qscriptfunction_p.h
	src/script/qscriptgc_p.h
	src/script/qscriptglobals_p.h
	src/script/qscriptmember_p.h
	src/script/qscriptnameid_p.h
	src/script/qscriptnodepool_p.h
	src/script/qscriptobject_p.h
	src/script/qscriptobjectfwd_p.h
	src/script/qscriptprettypretty.cpp
	src/script/qscriptprettypretty_p.h
	src/script/qscriptsyntaxcheckresult_p.h
	src/script/qscriptvalue.cpp
	src/script/qscriptvalue_p.h
	src/script/qscriptvaluefwd_p.h
	src/script/qscriptvalueimpl.cpp
	src/script/qscriptvalueimpl_p.h
	src/script/qscriptvalueimplfwd_p.h
	src/script/qscriptvalueiteratorimpl.cpp
	src/script/qscriptvalueiteratorimpl_p.h

1 files changed, 24 insertions, 9 deletions

diff --git a/doc/src/porting4.qdoc b/doc/src/porting4.qdoc
index 963b918..4efb7be 100644
--- a/doc/src/porting4.qdoc
+++ b/doc/src/porting4.qdoc
@@ -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$
 **
 ****************************************************************************/
@@ -174,7 +174,7 @@
     and MSVC 7.)
 
     If you get stuck, ask on the
-    \l{http://lists.trolltech.com/qt-interest/}{qt-interest}
+    \l{http://qt.nokia.com/lists/qt-interest/}{qt-interest}
     mailing list. If you are a licensed customer, you can also contact
     Qt's technical support team.
 
@@ -473,7 +473,7 @@
     \section1 Explicit Sharing
 
     Qt 4 is the first version of Qt that contains no \link
-    http://doc.trolltech.com/3.3/shclass.html explicitly shared
+    http://qt.nokia.com/doc/3.3/shclass.html explicitly shared
     \endlink classes. All classes that were explicitly shared in Qt 3
     are \e implicitly shared in Qt 4:
 
@@ -561,6 +561,21 @@
     \note Setting widget attributes to disable key features of Qt's widget
     rendering model may also cause other features to be disabled.
 
+    \section1 Compatibility Signals and Slots
+
+    When \c QT3_SUPPORT is defined, the default connection type for signals
+    and slots is the Qt::AutoCompatConnection type. This allows so-called
+    \e compatibility signals and slots (defined in Qt 3 support mode to provide
+    Qt 3 compatibility features) to be connected to other signals and
+    slots.
+
+    However, if Qt is compiled with debugging output enabled, and the
+    developer uses other connection types to connect to compatibility
+    signals and slots (perhaps by building their application without Qt 3
+    support enabled), then Qt will output warnings to the console to
+    indicate that compatibility connections are being made. This is intended
+    to be used as an aid in the process of porting a Qt 3 application to Qt 4.
+
     \section1 QAccel
 
     The \c QAccel class has been renamed Q3Accel and moved to the
@@ -1065,7 +1080,7 @@
     ensuring that the string is '\\0'-terminated. Another important
     issue was that conversions between \c QCString and QByteArray often
     gave confusing results. (See the
-    \l{http://doc.trolltech.com/qq/qq05-achtung.html#qcstringisastringofchars}{Achtung!
+    \l{http://qt.nokia.com/doc/qq/qq05-achtung.html#qcstringisastringofchars}{Achtung!
     Binary and Character Data} article in \e{Qt Quarterly} for an
     overview of the pitfalls.)
 
@@ -2426,13 +2441,13 @@
     that provides the old semantics. See the Q3Painter documentation
     for details and for the reasons why we had to make this change.
 
-    The \l{http://doc.trolltech.com/3.3/qpainter.html#CoordinateMode-enum}{QPainter::CoordinateMode}
+    The \l{http://qt.nokia.com/doc/3.3/qpainter.html#CoordinateMode-enum}{QPainter::CoordinateMode}
     enum has been removed in Qt 4. All clipping
     operations are now defined using logical coordinates and are subject
     to transformation operations.
 
     The
-    \l{http://doc.trolltech.com/3.3/qpainter.html#RasterOP-enum}{QPainter::RasterOP}
+    \l{http://qt.nokia.com/doc/3.3/qpainter.html#RasterOP-enum}{QPainter::RasterOP}
     enum has been replaced with QPainter::CompositionMode.
 
     \section1 QPicture
@@ -3244,7 +3259,7 @@
 
     \list \o If you use Q3SocketDevice in a thread to perform blocking
     network I/O (a technique encouraged by the \e{Qt Quarterly}
-    article \l{http://doc.trolltech.com/qq/qq09-networkthread.html}
+    article \l{http://qt.nokia.com/doc/qq/qq09-networkthread.html}
     {Unblocking Networking}), you can now use QTcpSocket, QFtp, or
     QNetworkAccessManager, which can be used from non-GUI threads.
 
@@ -4039,7 +4054,7 @@
 
     Sample code on how to do obtain similar behavior from Qt 4, previously
     handled by some of the above functions can be found in the
-    \l{http://doc.trolltech.com/qwidget-qt3.html}{Qt 3 Support Members for QWidget}
+    \l{http://qt.nokia.com/doc/qwidget-qt3.html}{Qt 3 Support Members for QWidget}
     page.
 
     A widget now receives change events in its QWidget::changeEvent()
@@ -4137,7 +4152,7 @@
     clearWFlags() has no direct replacement. You can use
     QWidget::setAttribute() instead. For example,
     \c{setAttribute(..., false)} to clear an attribute. More information
-    is available \l{http://doc.trolltech.com/qwidget.html#setAttribute}{here}.
+    is available \l{http://qt.nokia.com/doc/qwidget.html#setAttribute}{here}.
 
     testWFlags() was renamed to \l{QWidget::testAttribute()}{testAttribute()}.