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/import/import.pro | |
| 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/import/import.pro')
| -rw-r--r-- | examples/sensors/grue/import/import.pro | 8 |
1 files changed, 5 insertions, 3 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 |