From 8a79684ebfdf704054f40a72ee5e7bf2ebe06a13 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 21 Oct 2012 14:53:30 -0500 Subject: Fix inadvertent tqt changes. (cherry picked from commit 3d1c7581ff395fc373ca4b8bd8f65b540b37b12f) --- languages/cpp/app_templates/kscons_kxt/QUICKSTART | 10 +++++----- languages/cpp/app_templates/kscons_kxt/SConscript-src | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'languages/cpp/app_templates/kscons_kxt') diff --git a/languages/cpp/app_templates/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART index 0ba306bb..53ae8c9e 100644 --- a/languages/cpp/app_templates/kscons_kxt/QUICKSTART +++ b/languages/cpp/app_templates/kscons_kxt/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_kxt/SConscript-src b/languages/cpp/app_templates/kscons_kxt/SConscript-src index bc91cc0b..02432be5 100644 --- a/languages/cpp/app_templates/kscons_kxt/SConscript-src +++ b/languages/cpp/app_templates/kscons_kxt/SConscript-src @@ -33,7 +33,7 @@ myenv.KDEprogram( "%{APPNAMELC}", %{APPNAMELC}_sources ) ## Customization ## Additional include paths for compiling the source files -## Always add '../' (top-level directory) because tqmoc makes code that needs it +## Always add '../' (top-level directory) because moc makes code that needs it myenv.KDEaddpaths_includes( "./ ../" ) ## Necessary libraries to link against -- cgit v1.2.1