Cleaned qmake project files. Configuration and common parts are now in config_plugin.pri and config_odb.pri.

odb.pri

@@ -1,9 +1,11 @@
+include(config_odb.pri)
+
 win32 {
-    LIBS += -L"d:/prac/qt/lib"
-    INCLUDEPATH += d:/prac/odb/libodb-2.4.0
-    INCLUDEPATH += d:/prac/odb/libodb-qt-2.4.0
-    INCLUDEPATH += d:/prac/odb/libodb-sqlite-2.4.0
-    INCLUDEPATH += d:/prac/odb/sqlite
+    LIBS += -L$$LIB_PATH
+    INCLUDEPATH += $$ODB_INCLUDE_PREFIX/libodb-2.4.0
+    INCLUDEPATH += $$ODB_INCLUDE_PREFIX/libodb-qt-2.4.0
+    INCLUDEPATH += $$ODB_INCLUDE_PREFIX/libodb-sqlite-2.4.0
+    INCLUDEPATH += $$ODB_INCLUDE_PREFIX/sqlite
 }
 
 win32 {
@@ -21,7 +23,7 @@ unix {
 ODB_FLAGS += --database sqlite --profile qt --generate-schema --generate-query --generate-session --at-once --input-name $$TARGET --schema-format sql
 
 win32 {
-    ODB_PATH = d:\prac\odb\odb-2.4.0-i686-windows\bin\odb
+    ODB_PATH = $$ODB_INCLUDE_PREFIX\odb-2.4.0-i686-windows\bin\odb
 }
 unix {
     ODB_PATH = odb
@@ -46,10 +48,10 @@ ODB_FLAGS += -I $$PWD/core
 ODB_FLAGS += -I $$PWD/qdecimal/src
 ODB_FLAGS += -I $$PWD/qdecimal/decnumber
 ODB_FLAGS += $$ODB_OTHER_INCLUDES
-ODB_FLAGS += -x -std=c++11 -x -fPIC
+ODB_FLAGS += -x -std=c++11
 
 win32 {
-    ODB_FLAGS += -I d:/prac/odb/libodb-2.4.0
+    ODB_FLAGS += -I $$ODB_INCLUDE_PREFIX/libodb-2.4.0
 }
 
 # Newer versions of QtCreator do builds in a separate directory. As a
@@ -72,9 +74,17 @@ odb.commands = $$ODB_PATH $$ODB_FLAGS ${QMAKE_FILE_IN}
 odb.depends = $$ODB_PWD_FILES
 odb.variable_out = SOURCES
 odb.CONFIG = target_predeps
-odb.clean = $$TARGET-odb.cxx $$TARGET-odb.hxx $$TARGET-odb.ixx $$TARGET.sql
+odb.clean = $$TARGET-odb.cxx $$TARGET-odb.hxx $$TARGET-odb.ixx $$TARGET.sql *.h *.sql
 QMAKE_EXTRA_COMPILERS += odb
 
+odbh.name = odb ${QMAKE_FILE_IN}
+odbh.input = ODB_PWD_FILES
+odbh.output = $$TARGET-odb.hxx
+odbh.commands = @true
+odbh.depends = $$TARGET-odb.cxx
+odbh.CONFIG = no_link
+QMAKE_EXTRA_COMPILERS += odbh
+
 odbhc.target = odbhc
 unix {
     odbhc.commands = $(COPY) -p $$H_DIR .