7 files changed, 10 insertions, 9 deletions
diff --git a/qt/makefile b/qt/makefile
index cb2a0d2..37c0c6b 100644
--- a/qt/makefile
+++ b/qt/makefile
@@ -54,11 +54,13 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) --profile qt \
---generate-query --generate-schema --generate-session --table-prefix Qt
+$(gen) $(dist): export odb_options += --generate-schema --generate-query \
+--generate-session --profile qt --table-prefix qt_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(odb.l.cpp-options) $(odb_qt.l.cpp-options) $(qt_core.l.cpp-options)
 
+$(gen): odb_options += --database $(db_id)
+
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
 
 # Alias for default target.
@@ -69,7 +71,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/,,$(src_base)))
 
-$(dist): db_id := @database@
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export name := $(name)
diff --git a/qt/qt4-vc10.vcxproj b/qt/qt4-vc10.vcxproj
index 560489e..ec48faf 100644
--- a/qt/qt4-vc10.vcxproj
+++ b/qt/qt4-vc10.vcxproj
@@ -154,7 +154,7 @@
 __custom_build_entry__(
 __path__(odb_header_stem).hxx,
 odb __path__(odb_header_stem).hxx,
-odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)))) __path__(odb_header_stem).hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx,
 __path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx)
   </ItemGroup>
   <ItemGroup>
diff --git a/qt/qt4-vc11.vcxproj b/qt/qt4-vc11.vcxproj
index 229c450..34d9630 100644
--- a/qt/qt4-vc11.vcxproj
+++ b/qt/qt4-vc11.vcxproj
@@ -158,7 +158,7 @@
 __custom_build_entry__(
 __path__(odb_header_stem).hxx,
 odb __path__(odb_header_stem).hxx,
-odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)))) __path__(odb_header_stem).hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx,
 __path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx)
   </ItemGroup>
   <ItemGroup>
diff --git a/qt/qt4-vc9.vcproj b/qt/qt4-vc9.vcproj
index 8d5e82e..f8b4cce 100644
--- a/qt/qt4-vc9.vcproj
+++ b/qt/qt4-vc9.vcproj
@@ -344,7 +344,7 @@ __source_entries__(extra_sources)
 __file_entry_custom_build__(
 __path__(odb_header_stem).hxx,
 odb __path__(odb_header_stem).hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)))) __path__(odb_header_stem).hxx,
+odb.exe --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx,
 __path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx)
 __file_entry__(__path__(odb_header_stem)-odb.hxx)
 __file_entry__(__path__(odb_header_stem)-odb.ixx)
diff --git a/qt/qt5-vc10.vcxproj b/qt/qt5-vc10.vcxproj
index a185751..08696f8 100644
--- a/qt/qt5-vc10.vcxproj
+++ b/qt/qt5-vc10.vcxproj
@@ -154,7 +154,7 @@
 __custom_build_entry__(
 __path__(odb_header_stem).hxx,
 odb __path__(odb_header_stem).hxx,
-odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)))) __path__(odb_header_stem).hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx,
 __path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx)
   </ItemGroup>
   <ItemGroup>
diff --git a/qt/qt5-vc11.vcxproj b/qt/qt5-vc11.vcxproj
index 46b0448..2f96cbd 100644
--- a/qt/qt5-vc11.vcxproj
+++ b/qt/qt5-vc11.vcxproj
@@ -158,7 +158,7 @@
 __custom_build_entry__(
 __path__(odb_header_stem).hxx,
 odb __path__(odb_header_stem).hxx,
-odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)))) __path__(odb_header_stem).hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx,
 __path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx)
   </ItemGroup>
   <ItemGroup>
diff --git a/qt/qt5-vc9.vcproj b/qt/qt5-vc9.vcproj
index 7882fe6..cbfba14 100644
--- a/qt/qt5-vc9.vcproj
+++ b/qt/qt5-vc9.vcproj
@@ -344,7 +344,7 @@ __source_entries__(extra_sources)
 __file_entry_custom_build__(
 __path__(odb_header_stem).hxx,
 odb __path__(odb_header_stem).hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)))) __path__(odb_header_stem).hxx,
+odb.exe --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx,
 __path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx)
 __file_entry__(__path__(odb_header_stem)-odb.hxx)
 __file_entry__(__path__(odb_header_stem)-odb.ixx)