From e02e31c8b9d854cd62cbe9799228f6e08e882773 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 22:04:08 -0600 Subject: Sync with latest script --- doc/porting2.doc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/porting2.doc') diff --git a/doc/porting2.doc b/doc/porting2.doc index 227ca1ddd..3d0fb0521 100644 --- a/doc/porting2.doc +++ b/doc/porting2.doc @@ -16,7 +16,7 @@ ** and the KDE Free Qt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -73,7 +73,7 @@ compiler errors (rather than mysterious results), or produce run-time messages. The result is that Qt 2.x includes many additional features, discards obsolete functionality that is easily converted to use the new features, and that porting an application from Qt 1.x to Qt 2.x is -a simple task well worth the amount of effort retquired. +a simple task well worth the amount of effort required. To port code using Qt 1.x to use Qt 2.x: @@ -257,7 +257,7 @@ that took const char* now take const QString&.

To take full advantage of the new Internationalization -functionality in Qt 2.x, the following steps are retquired: +functionality in Qt 2.x, the following steps are required: