diff options
author | Timothy Pearson <[email protected]> | 2011-12-05 22:04:08 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-05 22:04:08 -0600 |
commit | e02e31c8b9d854cd62cbe9799228f6e08e882773 (patch) | |
tree | 53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /doc/porting2.doc | |
parent | 143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff) | |
download | tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip |
Sync with latest script
Diffstat (limited to 'doc/porting2.doc')
-rw-r--r-- | doc/porting2.doc | 8 |
1 files changed, 4 insertions, 4 deletions
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&. <p> 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: <ul> <li> Start converting all uses of "const char*" in parameters to @@ -890,7 +890,7 @@ use it outside a member function, you'll need to prefix with Qt::. <p>The binary storage format of QPicture is changed, but the Qt 2.x QPicture class can both read and write Qt 1.x format QPictures. No -special handling is retquired for reading; QPicture will automatically +special handling is required for reading; QPicture will automatically detect the version number. In order to write a Qt 1.x format QPicture, set the formatVersion parameter to 1 in the QPicture constructor. |