diff options
Diffstat (limited to 'examples/sensors/grue/import')
| -rw-r--r-- | examples/sensors/grue/import/import.pro | 8 | ||||
| -rw-r--r-- | examples/sensors/grue/import/main.cpp | 16 |
2 files changed, 18 insertions, 6 deletions
diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro index ab4d1779..17d7713e 100644 --- a/examples/sensors/grue/import/import.pro +++ b/examples/sensors/grue/import/import.pro @@ -2,16 +2,18 @@ TEMPLATE = lib CONFIG += plugin TARGET = $$qtLibraryTarget(declarative_grue) -DESTDIR = ../Grue + +macos: DESTDIR = ../grue_app.app/Contents/MacOS/Grue +else: DESTDIR = ../Grue QT = core gui qml sensors -INCLUDEPATH += $$PWD/../lib -LIBS += -L$$OUT_PWD/.. -lgruesensor +include(../lib/lib.pri) # Shared gruesensor library will be installed in parent directory. # Define rpath so that this plugin will know where to look for it. unix:!mac: QMAKE_LFLAGS += -Wl,-rpath,\\\$\$ORIGIN/.. +macos: QMAKE_RPATHDIR += @loader_path/../../Frameworks SOURCES = main.cpp diff --git a/examples/sensors/grue/import/main.cpp b/examples/sensors/grue/import/main.cpp index f321acff..b4b6faae 100644 --- a/examples/sensors/grue/import/main.cpp +++ b/examples/sensors/grue/import/main.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 |