summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2018-03-13 10:21:35 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2018-03-13 10:21:35 +0100
commitf9f89587026cd22115f06c216e2d69c4142c7060 (patch)
treeb6284e17a076df0e1a026523aac1fdbf80e28ce1
parent86deabd9c8c42412b4467d01b362a8454e5e762f (diff)
parent545c3598e9e64e2d940266dbceed972d5179c813 (diff)
downloadlibnitrokey-f9f89587026cd22115f06c216e2d69c4142c7060.tar.gz
libnitrokey-f9f89587026cd22115f06c216e2d69c4142c7060.tar.bz2
Merge branch 'pr_101'
Fixup for QMake Issue #101
-rw-r--r--libnitrokey.pro36
1 files changed, 18 insertions, 18 deletions
diff --git a/libnitrokey.pro b/libnitrokey.pro
index 3c79a78..f72cd6d 100644
--- a/libnitrokey.pro
+++ b/libnitrokey.pro
@@ -15,22 +15,22 @@ QMAKE_TARGET_COPYRIGHT = Copyright (c) 2015-2018 Nitrokey UG
HEADERS = \
$$PWD/hidapi/hidapi/hidapi.h \
- $$PWD/include/command.h \
- $$PWD/include/command_id.h \
- $$PWD/include/CommandFailedException.h \
- $$PWD/include/cxx_semantics.h \
- $$PWD/include/device.h \
- $$PWD/include/device_proto.h \
- $$PWD/include/DeviceCommunicationExceptions.h \
- $$PWD/include/dissect.h \
- $$PWD/include/LibraryException.h \
- $$PWD/include/log.h \
- $$PWD/include/LongOperationInProgressException.h \
- $$PWD/include/misc.h \
- $$PWD/include/NitrokeyManager.h \
- $$PWD/include/stick10_commands.h \
- $$PWD/include/stick10_commands_0.8.h \
- $$PWD/include/stick20_commands.h \
+ $$PWD/libnitrokey/command.h \
+ $$PWD/libnitrokey/command_id.h \
+ $$PWD/libnitrokey/CommandFailedException.h \
+ $$PWD/libnitrokey/cxx_semantics.h \
+ $$PWD/libnitrokey/device.h \
+ $$PWD/libnitrokey/device_proto.h \
+ $$PWD/libnitrokey/DeviceCommunicationExceptions.h \
+ $$PWD/libnitrokey/dissect.h \
+ $$PWD/libnitrokey/LibraryException.h \
+ $$PWD/libnitrokey/log.h \
+ $$PWD/libnitrokey/LongOperationInProgressException.h \
+ $$PWD/libnitrokey/misc.h \
+ $$PWD/libnitrokey/NitrokeyManager.h \
+ $$PWD/libnitrokey/stick10_commands.h \
+ $$PWD/libnitrokey/stick10_commands_0.8.h \
+ $$PWD/libnitrokey/stick20_commands.h \
$$PWD/NK_C_API.h
@@ -72,8 +72,8 @@ win32 {
INCLUDEPATH = \
$$PWD/. \
$$PWD/hidapi/hidapi \
- $$PWD/include \
- $$PWD/include/hidapi \
+ $$PWD/libnitrokey \
+ $$PWD/libnitrokey/hidapi \
$$PWD/unittest \
$$PWD/unittest/Catch/single_include