summaryrefslogtreecommitdiffstats
path: root/qdb
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2017-03-09 11:42:30 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2017-03-10 14:16:26 +0000
commitc0dcb93adabba2e26731a5bab8a6381d48b2e529 (patch)
tree49f189db2e43526c55030e63cf288e8c5da2830a /qdb
parentdc7069e55516b6b7e7936e2c88920a278b23ce85 (diff)
Fix installation on Windows
Install targets were gated on unix, so nothing intended was actually installed on Windows. One would be excused to think that there's no need to install a static library that has already been linked with the executable. However, the tests streamtest and servicetest link against the library as well. In Coin they are built in a separate machine and only have the source and the installed components available. Thus not installing the static library means that those tests will fail to find the library. Via qt_parts.prf we included qt_example_installs.prf which created an nmake target that attempted to install the qmake files used in the project. The destination path for installing them was malformed, since it was created by concatenating two absolute Windows paths. Because the path contained ':', it led to an error message "The filename, directory name, or volume label syntax is incorrect.". Change-Id: Idab40e3647de863a7b8ab47ff9b42b8990ed52ae Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'qdb')
-rw-r--r--qdb/qdb.pro5
1 files changed, 3 insertions, 2 deletions
diff --git a/qdb/qdb.pro b/qdb/qdb.pro
index 43744c8..b6fca45 100644
--- a/qdb/qdb.pro
+++ b/qdb/qdb.pro
@@ -53,10 +53,11 @@ SOURCES += \
INCLUDEPATH += $$PWD/../
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target
+
unix {
LIBS += -L$$OUT_PWD/../libqdb -lqdb
- target.path = $$[QT_INSTALL_BINS]
- INSTALLS += target
}
win32 {