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/moc.doc | |
parent | 143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff) | |
download | tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip |
Sync with latest script
Diffstat (limited to 'doc/moc.doc')
-rw-r--r-- | doc/moc.doc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/moc.doc b/doc/moc.doc index daf8b0048..f017a66ef 100644 --- a/doc/moc.doc +++ b/doc/moc.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: @@ -53,7 +53,7 @@ The moc reads a C++ source file. If it finds one or more class declarations that contain the Q_OBJECT macro, it produces another C++ source file which contains the meta object code for the classes that use the Q_OBJECT macro. Among other things, meta object code is -retquired for the signal/slot mechanism, runtime type information and +required for the signal/slot mechanism, runtime type information and the dynamic property system. The C++ source file generated by the moc must be compiled and linked @@ -62,7 +62,7 @@ class's source file). If you use \link qmake-manual.book qmake\endlink to create your Makefiles, build rules will be included that call the moc when -retquired, so you will not need to use the moc directly. For more +required, so you will not need to use the moc directly. For more background information on moc, see \link templates.html Why doesn't Qt use templates for signals and slots?\endlink. @@ -317,7 +317,7 @@ Less importantly, the following constructs are illegal. All of them have alternatives which we think are usually better, so removing these limitations is not a high priority for us. -\section2 Multiple inheritance retquires QObject to be first +\section2 Multiple inheritance requires QObject to be first If you are using multiple inheritance, moc assumes that the \e first inherited class is a subclass of QObject. Also, be sure that \e only |