diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 14:53:30 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-17 18:35:37 +0100 |
commit | 8a79684ebfdf704054f40a72ee5e7bf2ebe06a13 (patch) | |
tree | a9e2086e09d84560bc047a833736019b53ddef1c /languages/cpp/app_templates/kscons_kmdi | |
parent | 3c15d3e1bbdb5897c98244a39785be1c657ff7ef (diff) | |
download | tdevelop-8a79684ebfdf704054f40a72ee5e7bf2ebe06a13.tar.gz tdevelop-8a79684ebfdf704054f40a72ee5e7bf2ebe06a13.zip |
Fix inadvertent tqt changes.
(cherry picked from commit 3d1c7581ff395fc373ca4b8bd8f65b540b37b12f)
Diffstat (limited to 'languages/cpp/app_templates/kscons_kmdi')
-rw-r--r-- | languages/cpp/app_templates/kscons_kmdi/QUICKSTART | 10 | ||||
-rw-r--r-- | languages/cpp/app_templates/kscons_kmdi/SConscript-src | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART index 0ba306bb..53ae8c9e 100644 --- a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART +++ b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART @@ -65,16 +65,16 @@ TQMOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT -in order to compile. foo_tqmoc.cpp is usually generated, and is -used to produce foo_tqmoc.o which is linked with the +in order to compile. foo_moc.cpp is usually generated, and is +used to produce foo_moc.o which is linked with the program or the library. -In kde programs, 'foo.tqmoc' is generated instead of foo_tqmoc.cpp, +In kde programs, 'foo.moc' is generated instead of foo_moc.cpp, and it must be included at the very end of foo.cpp (add #include "foo.moc" : this increases the speed of compilation a *lot* and makes less object files. -Both modes are provided though, see test6-tqmocfiesta/ +Both modes are provided though, see test6-mocfiesta/ ------------------------------------------ MINIMUM SCONS DISTRIBUTION @@ -127,7 +127,7 @@ remember that libtool is broken on many systems (invalid flags among others), so when you can work without libtool (small projects especially), just do it. -** tqmoc processing ** +** moc processing ** As stated above, you should always add #include "foo.moc" for your qt classes (Q_OBJECT) to save precious compilation time. diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-src b/languages/cpp/app_templates/kscons_kmdi/SConscript-src index 9850e2ae..746cdf98 100644 --- a/languages/cpp/app_templates/kscons_kmdi/SConscript-src +++ b/languages/cpp/app_templates/kscons_kmdi/SConscript-src @@ -1,6 +1,6 @@ #! /usr/bin/env python ## This script is a quick test to demonstrate (and test) -## the bksys tqmoc handling '#include "file.moc"' can be added .. or not +## the bksys moc handling '#include "file.moc"' can be added .. or not ## ## Thomas Nagy, 2005 ## This file can be reused freely for any project (see COPYING) |