diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2011-05-31 14:21:30 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2011-05-31 14:21:30 +0200 |
commit | 53a16157cbe845cd25c92cb3461b32709fc91936 (patch) | |
tree | 17b79ac9a3f719d0c33f554c93d68f531d494180 /vcl | |
parent | 65347f4b1cd17895653a796b692f9b3f87d1fe34 (diff) |
do not have a .cxx file just for #including a .moc file
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/Library_vclplug_kde4.mk | 1 | ||||
-rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/kde4/KDEXLib.moc.cxx | 29 | ||||
-rw-r--r-- | vcl/unx/kde4/Makefile | 4 |
4 files changed, 4 insertions, 32 deletions
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 69e7a7375b2c..0f7f3e78696b 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -85,7 +85,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\ vcl/unx/kde4/KDESalGraphics \ vcl/unx/kde4/KDESalInstance \ vcl/unx/kde4/KDEXLib \ - vcl/unx/kde4/KDEXLib.moc \ vcl/unx/kde4/main \ vcl/unx/kde4/VCLKDEApplication \ )) diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index ea085596da60..28b514148f50 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -419,4 +419,6 @@ void KDEXLib::doStartup() } } +#include "KDEXLib.moc" + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/kde4/KDEXLib.moc.cxx b/vcl/unx/kde4/KDEXLib.moc.cxx deleted file mode 100644 index 233068dd236f..000000000000 --- a/vcl/unx/kde4/KDEXLib.moc.cxx +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Initial Developer of the Original Code is - * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.) - * Portions created by the Initial Developer are Copyright (C) 2011 the - * Initial Developer. All Rights Reserved. - * - * Contributor(s): Caolán McNamara <caolanm@redhat.com> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. - */ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "KDEXLib.moc.hxx" diff --git a/vcl/unx/kde4/Makefile b/vcl/unx/kde4/Makefile index 115b842c4278..4259715656f4 100644 --- a/vcl/unx/kde4/Makefile +++ b/vcl/unx/kde4/Makefile @@ -23,9 +23,9 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -all : KDEXLib.moc.hxx +KDEXLib.cxx : KDEXLib.moc -KDEXLib.moc.hxx : $(realpath $(dir $(firstword $(MAKEFILE_LIST))))/KDEXLib.hxx +KDEXLib.moc : $(realpath $(dir $(firstword $(MAKEFILE_LIST))))/KDEXLib.hxx $(MOC4) $< -o $@ .PHONY : all |