diff options
| author | Michele Calgaro <[email protected]> | 2018-09-18 01:19:46 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-09-18 01:19:46 +0900 |
| commit | 2df70f03d493f5226821dd2e1da3759e3abceb02 (patch) | |
| tree | f105d7829be7401bd27b833e0e26cf64c6a62ad1 /src/moc/moc_yacc.cpp | |
| parent | f849f22528ee9eb5eeb1f9aa92822846b2b3e01f (diff) | |
| download | qt3-2df70f03d493f5226821dd2e1da3759e3abceb02.tar.gz qt3-2df70f03d493f5226821dd2e1da3759e3abceb02.zip | |
Revert "QT_THREAD_SUPPORT -> TQT_THREAD_SUPPORT conversion to align to updated admin module"
The original commit was a mistake and should not have been pushed.
This reverts commit f849f22528ee9eb5eeb1f9aa92822846b2b3e01f.
Diffstat (limited to 'src/moc/moc_yacc.cpp')
| -rw-r--r-- | src/moc/moc_yacc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index f49b2c1..bf152b3 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -5813,8 +5813,8 @@ void generateClass() // generate C++ source code for a class // fprintf( out, "QMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() ); fprintf( out, " if ( metaObj ) {\n\treturn metaObj;\n}\n" ); - fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n if (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->lock();\n" ); - fprintf( out, " if ( metaObj ) {\n\tif (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n }\n#endif // TQT_THREAD_SUPPORT\n" ); + fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->lock();\n" ); + fprintf( out, " if ( metaObj ) {\n\tif (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n }\n#endif // QT_THREAD_SUPPORT\n" ); if ( isQObject ) fprintf( out, " QMetaObject* parentObject = staticQtMetaObject();\n" ); else if ( !g->superClassName.isEmpty() ) @@ -5884,7 +5884,7 @@ void generateClass() // generate C++ source code for a class // Setup cleanup handler and return meta object // fprintf( out, " cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() ); - fprintf( out, "#ifdef TQT_THREAD_SUPPORT\n if (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->unlock();\n#endif // TQT_THREAD_SUPPORT\n" ); + fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (qt_sharedMetaObjectMutex) qt_sharedMetaObjectMutex->unlock();\n#endif // QT_THREAD_SUPPORT\n" ); fprintf( out, " return metaObj;\n}\n" ); // |