diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:07:14 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:00:03 +0200 |
commit | c0fe554f498025067edd78e75e3efb46868f8fe6 (patch) | |
tree | 00b468e1a38f186f908e1c0c9dcca0c183736c3e /examples/sensors/grue/lib | |
parent | 9a1b163e1fdd99a838c082805c687205b766da25 (diff) | |
parent | 2ff8f06e71d5eeb40cbdebc104c00073a3c2871a (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Iac052b07a815ed6bcaea42109895e323342c5d71
Diffstat (limited to 'examples/sensors/grue/lib')
-rw-r--r-- | examples/sensors/grue/lib/gruesensor.cpp | 16 | ||||
-rw-r--r-- | examples/sensors/grue/lib/gruesensor.h | 16 | ||||
-rw-r--r-- | examples/sensors/grue/lib/gruesensor_p.h | 16 | ||||
-rw-r--r-- | examples/sensors/grue/lib/lib.pri | 6 | ||||
-rw-r--r-- | examples/sensors/grue/lib/lib.pro | 5 |
5 files changed, 49 insertions, 10 deletions
diff --git a/examples/sensors/grue/lib/gruesensor.cpp b/examples/sensors/grue/lib/gruesensor.cpp index 4cb03296..1de2f4e8 100644 --- a/examples/sensors/grue/lib/gruesensor.cpp +++ b/examples/sensors/grue/lib/gruesensor.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtSensors module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are diff --git a/examples/sensors/grue/lib/gruesensor.h b/examples/sensors/grue/lib/gruesensor.h index dd457737..b65e5d89 100644 --- a/examples/sensors/grue/lib/gruesensor.h +++ b/examples/sensors/grue/lib/gruesensor.h @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtSensors module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are diff --git a/examples/sensors/grue/lib/gruesensor_p.h b/examples/sensors/grue/lib/gruesensor_p.h index 4afcaad7..0216d06b 100644 --- a/examples/sensors/grue/lib/gruesensor_p.h +++ b/examples/sensors/grue/lib/gruesensor_p.h @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtSensors module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are diff --git a/examples/sensors/grue/lib/lib.pri b/examples/sensors/grue/lib/lib.pri new file mode 100644 index 00000000..0e3da252 --- /dev/null +++ b/examples/sensors/grue/lib/lib.pri @@ -0,0 +1,6 @@ +INCLUDEPATH += $$PWD + +macos: LIBS += -L$$OUT_PWD/../grue_app.app/Contents/Frameworks +else: LIBS += -L$$OUT_PWD/.. + +LIBS += -lgruesensor diff --git a/examples/sensors/grue/lib/lib.pro b/examples/sensors/grue/lib/lib.pro index 6106f9ed..cc10e5c4 100644 --- a/examples/sensors/grue/lib/lib.pro +++ b/examples/sensors/grue/lib/lib.pro @@ -1,7 +1,10 @@ TEMPLATE = lib TARGET = gruesensor -DESTDIR = $$OUT_PWD/.. +macos: DESTDIR = ../grue_app.app/Contents/Frameworks +else: DESTDIR = $$OUT_PWD/.. + +macos: QMAKE_SONAME_PREFIX = @rpath DEFINES *= QT_BUILD_GRUE_LIB QT = core sensors |