8 files changed, 2 insertions, 99 deletions
diff --git a/libodb-qt/odb/qt/details/build2/config-stub.h b/libodb-qt/odb/qt/details/build2/config-stub.h
deleted file mode 100644
index fbb2971..0000000
--- a/libodb-qt/odb/qt/details/build2/config-stub.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/qt/details/build2/config-stub.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-#include <odb/qt/details/config.h>
diff --git a/libodb-qt/odb/qt/details/build2/config-vc-stub.h b/libodb-qt/odb/qt/details/build2/config-vc-stub.h
deleted file mode 100644
index e6a412d..0000000
--- a/libodb-qt/odb/qt/details/build2/config-vc-stub.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/qt/details/build2/config-vc-stub.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-#include <odb/qt/details/config-vc.h>
diff --git a/libodb-qt/odb/qt/details/build2/config-vc.h b/libodb-qt/odb/qt/details/build2/config-vc.h
deleted file mode 100644
index 36113ce..0000000
--- a/libodb-qt/odb/qt/details/build2/config-vc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* file      : odb/qt/details/build2/config-vc.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Configuration file for Windows/VC++ for the build2 build. */
-
-#ifndef ODB_QT_DETAILS_CONFIG_VC_H
-#define ODB_QT_DETAILS_CONFIG_VC_H
-
-/* Define LIBODB_QT_BUILD2 for the installed case. */
-#ifndef LIBODB_QT_BUILD2
-#  define LIBODB_QT_BUILD2
-#endif
-
-#endif /* ODB_QT_DETAILS_CONFIG_VC_H */
diff --git a/libodb-qt/odb/qt/details/build2/config.h b/libodb-qt/odb/qt/details/build2/config.h
deleted file mode 100644
index 12d168f..0000000
--- a/libodb-qt/odb/qt/details/build2/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* file      : odb/qt/details/build2/config.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Static configuration file for the build2 build. The installed case
-   (when LIBODB_QT_BUILD2 is not necessarily defined) is the only
-   reason we have it. */
-
-#ifndef ODB_QT_DETAILS_CONFIG_H
-#define ODB_QT_DETAILS_CONFIG_H
-
-/* Define LIBODB_QT_BUILD2 for the installed case. */
-#ifndef LIBODB_QT_BUILD2
-#  define LIBODB_QT_BUILD2
-#endif
-
-#endif /* ODB_QT_DETAILS_CONFIG_H */
diff --git a/libodb-qt/odb/qt/details/config-vc.h b/libodb-qt/odb/qt/details/config-vc.h
deleted file mode 100644
index 6718a07..0000000
--- a/libodb-qt/odb/qt/details/config-vc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/qt/details/config-vc.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Dummy configuration file for Windows/VC++. */
diff --git a/libodb-qt/odb/qt/details/config.h.in b/libodb-qt/odb/qt/details/config.h.in
deleted file mode 100644
index a0c3989..0000000
--- a/libodb-qt/odb/qt/details/config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
-/* file      : odb/qt/details/config.h.in
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* This file is automatically processed by configure. */
-
-#ifndef ODB_QT_DETAILS_CONFIG_H
-#define ODB_QT_DETAILS_CONFIG_H
-
-#undef LIBODB_QT_STATIC_LIB
-
-#endif /* ODB_QT_DETAILS_CONFIG_H */
diff --git a/libodb-qt/odb/qt/details/config.hxx b/libodb-qt/odb/qt/details/config.hxx
index 9077380..01a4eb5 100644
--- a/libodb-qt/odb/qt/details/config.hxx
+++ b/libodb-qt/odb/qt/details/config.hxx
@@ -24,13 +24,7 @@
 #      define __PIC__
 #    endif
 #  endif
-#  define LIBODB_QT_STATIC_LIB
-#elif !defined(LIBODB_QT_BUILD2)
-#  ifdef _MSC_VER
-#    include <odb/qt/details/config-vc.h>
-#  else
-#    include <odb/qt/details/config.h>
-#  endif
+#  define LIBODB_QT_STATIC
 #endif
 
 // no post
diff --git a/libodb-qt/odb/qt/details/export.hxx b/libodb-qt/odb/qt/details/export.hxx
index 4c0097f..f38d0ee 100644
--- a/libodb-qt/odb/qt/details/export.hxx
+++ b/libodb-qt/odb/qt/details/export.hxx
@@ -6,7 +6,7 @@
 
 #include <odb/pre.hxx>
 
-#include <odb/qt/details/config.hxx>
+#include <odb/qt/details/config.hxx> // LIBODB_QT_STATIC if ODB_COMPILER
 
 // Normally we don't export class templates (but do complete specializations),
 // inline functions, and classes with only inline member functions. Exporting
@@ -16,8 +16,6 @@
 // used before their inline definition. The workaround is to reorder code. In
 // the end it's all trial and error.
 
-#ifdef LIBODB_QT_BUILD2
-
 #if defined(LIBODB_QT_STATIC)         // Using static.
 #  define LIBODB_QT_EXPORT
 #elif defined(LIBODB_QT_STATIC_BUILD) // Building static.
@@ -43,36 +41,6 @@
 #  define LIBODB_QT_EXPORT            // Using static or shared.
 #endif
 
-#else // LIBODB_QT_BUILD2
-
-#ifdef LIBODB_QT_STATIC_LIB
-#  define LIBODB_QT_EXPORT
-#else
-#  ifdef _WIN32
-#    ifdef _MSC_VER
-#      ifdef LIBODB_QT_DYNAMIC_LIB
-#        define LIBODB_QT_EXPORT __declspec(dllexport)
-#      else
-#        define LIBODB_QT_EXPORT __declspec(dllimport)
-#      endif
-#    else
-#      ifdef LIBODB_QT_DYNAMIC_LIB
-#        ifdef DLL_EXPORT
-#          define LIBODB_QT_EXPORT __declspec(dllexport)
-#        else
-#          define LIBODB_QT_EXPORT
-#        endif
-#      else
-#        define LIBODB_QT_EXPORT __declspec(dllimport)
-#      endif
-#    endif
-#  else
-#    define LIBODB_QT_EXPORT
-#  endif
-#endif
-
-#endif // LIBODB_QT_BUILD2
-
 #include <odb/post.hxx>
 
 #endif // ODB_QT_DETAILS_EXPORT_HXX