diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2019-08-08 07:19:10 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2019-08-08 08:09:30 +0000 |
| commit | b4377cf4bde9b5a27b671913aa9749f8e37b55b9 (patch) | |
| tree | 45556fe488c422f89be45a7495626081d53c5140 /commoninclude.pri | |
| parent | 6efbd8892b4b5875b86614d0ad9f2160a34a27e8 (diff) | |
Clean up android build
Change-Id: I8b4783d47b0ac9bfd0e636dcfb564d52ae6522f2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'commoninclude.pri')
| -rw-r--r-- | commoninclude.pri | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/commoninclude.pri b/commoninclude.pri index 83eb886..1e08767 100644 --- a/commoninclude.pri +++ b/commoninclude.pri @@ -7,8 +7,7 @@ contains(TEMPLATE, lib) { } QT += core gui openglextensions -DEFINES += COMPILED_FROM_DSP \ - QT3DSDM_USE_NVLOG QT3DSDM_META_DATA_NO_SIGNALS +DEFINES += COMPILED_FROM_DSP QT3DSDM_USE_NVLOG QT3DSDM_META_DATA_NO_SIGNALS INCLUDEPATH += \ $$PWD/src \ @@ -35,7 +34,7 @@ INCLUDEPATH += \ $$PWD/src/qmlstreamer \ $$PWD/src/runtimerender \ $$PWD/src/runtimerender/graphobjects \ - $$PWD/src/runtimerender/resourcemanager \ + $$PWD/src/runtimerender/resourcemanager # TODO: Investigate whether these can be moved to commonplatform win32-msvc { @@ -70,12 +69,4 @@ macos { INCLUDEPATH += \ $$PWD/src/3rdparty/platformspecific/Macos/Qt3DSLibs \ $$PWD/src/platformspecific/macos/libs - -} - -android { -INCLUDEPATH += \ - $$PWD/src/platformspecific/android/jni/libs/nv_thread \ - $$PWD/src/3rdparty/platformspecific/Android/jni/Qt3DSLibs \ - $$PWD/src/3rdparty/platformspecific/Android/jni } |