From dfb1ac9f19feacdce627b7e4bb20192bc71fe2d6 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 17 Mar 2011 16:32:54 +0200 Subject: Add Qt import stub --- odb/qt/dummy.cxx | 7 ++++++- odb/qt/makefile | 12 +++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'odb') diff --git a/odb/qt/dummy.cxx b/odb/qt/dummy.cxx index abf4e34..fa60d2a 100644 --- a/odb/qt/dummy.cxx +++ b/odb/qt/dummy.cxx @@ -1,3 +1,8 @@ +#include #include -void dummy () {} +QString dummy () +{ + QString s ("Hello, Qt!"); + return s; +} diff --git a/odb/qt/makefile b/odb/qt/makefile index 888f66a..756edd0 100644 --- a/odb/qt/makefile +++ b/odb/qt/makefile @@ -24,11 +24,17 @@ $(call import,\ $(scf_root)/import/libodb/stub.make,\ l: odb.l,cpp-options: odb.l.cpp-options) +$(call import,\ + $(scf_root)/import/libqt/core/stub.make,\ + l: qt_core.l,\ + cpp-options: qt_core.l.cpp-options,\ + cpp-options-inline: qt_core_cpp_options) + # Build. # -$(odb_qt.l): $(cxx_obj) $(odb.l) -$(odb_qt.l.cpp-options): value := -I$(out_root) -I$(src_root) -$(odb_qt.l.cpp-options): $(odb.l.cpp-options) +$(odb_qt.l): $(cxx_obj) $(odb.l) $(qt_core.l) +$(odb_qt.l.cpp-options): value := -I$(out_root) -I$(src_root) $(qt_core_cpp_options) +$(odb_qt.l.cpp-options): $(odb.l.cpp-options) $(qt_core.l.cpp-options) $(cxx_obj) $(cxx_od): $(odb_qt.l.cpp-options) $(out_base)/details/config.h -- cgit v1.1