diff options
| -rw-r--r-- | odb/qt/dummy.cxx | 14 | ||||
| -rw-r--r-- | odb/qt/dummy.hxx | 12 | ||||
| -rw-r--r-- | odb/qt/libodb-qt-vc10.vcxproj | 8 | ||||
| -rw-r--r-- | odb/qt/libodb-qt-vc9.vcproj | 8 |
4 files changed, 30 insertions, 12 deletions
diff --git a/odb/qt/dummy.cxx b/odb/qt/dummy.cxx index fa60d2a..81468bc 100644 --- a/odb/qt/dummy.cxx +++ b/odb/qt/dummy.cxx @@ -1,8 +1,14 @@ -#include <QString> +#include <odb/qt/dummy.hxx> #include <odb/qt/exception.hxx> -QString dummy () +namespace odb { - QString s ("Hello, Qt!"); - return s; + namespace qt + { + QString dummy () + { + QString s ("Hello, Qt!"); + return s; + } + } } diff --git a/odb/qt/dummy.hxx b/odb/qt/dummy.hxx new file mode 100644 index 0000000..e35625a --- /dev/null +++ b/odb/qt/dummy.hxx @@ -0,0 +1,12 @@ +// Force compilation and creation of libodb-qt library for now. +// +#include <QString> +#include <odb/qt/details/export.hxx> + +namespace odb +{ + namespace qt + { + LIBODB_QT_EXPORT QString dummy (); + } +} diff --git a/odb/qt/libodb-qt-vc10.vcxproj b/odb/qt/libodb-qt-vc10.vcxproj index d01556f..fb50334 100644 --- a/odb/qt/libodb-qt-vc10.vcxproj +++ b/odb/qt/libodb-qt-vc10.vcxproj @@ -93,7 +93,7 @@ <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>odb-d.lib;qt-core-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>odb-d.lib;QtCored4.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <OutputFile>$(TargetPath)</OutputFile> @@ -111,7 +111,7 @@ <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>odb-d.lib;qt-core-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>odb-d.lib;QtCored4.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <OutputFile>$(TargetPath)</OutputFile> @@ -131,7 +131,7 @@ <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>odb.lib;qt-core.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>odb.lib;QtCore4.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -153,7 +153,7 @@ <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <AdditionalDependencies>odb.lib;qt-core.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>odb.lib;QtCore4.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> diff --git a/odb/qt/libodb-qt-vc9.vcproj b/odb/qt/libodb-qt-vc9.vcproj index fb67497..471538a 100644 --- a/odb/qt/libodb-qt-vc9.vcproj +++ b/odb/qt/libodb-qt-vc9.vcproj @@ -66,7 +66,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="odb-d.lib qt-core-d.lib" + AdditionalDependencies="odb-d.lib QtCored4.lib" OutputFile="$(OutDir)\bin\odb-qt-d-__value__(interface_version)-vc9.dll" LinkIncremental="2" GenerateDebugInformation="true" @@ -144,7 +144,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="odb-d.lib qt-core-d.lib" + AdditionalDependencies="odb-d.lib QtCored4.lib" OutputFile="$(OutDir)\bin64\odb-qt-d-__value__(interface_version)-vc9.dll" LinkIncremental="2" GenerateDebugInformation="true" @@ -222,7 +222,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="odb.lib qt-core.lib" + AdditionalDependencies="odb.lib QtCore4.lib" OutputFile="$(OutDir)\bin\odb-qt-__value__(interface_version)-vc9.dll" LinkIncremental="1" GenerateDebugInformation="true" @@ -303,7 +303,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="odb.lib qt-core.lib" + AdditionalDependencies="odb.lib QtCore4.lib" OutputFile="$(OutDir)\bin64\odb-qt-__value__(interface_version)-vc9.dll" LinkIncremental="1" GenerateDebugInformation="true" |