diff options
| author | Titta Heikkala <titta.heikkala@digia.com> | 2013-10-31 14:19:13 +0200 |
|---|---|---|
| committer | Titta Heikkala <titta.heikkala@digia.com> | 2013-10-31 14:26:58 +0200 |
| commit | 8da9536b16ef71b038a86a82e7c71f76cd21a922 (patch) | |
| tree | 9b0be96f636cc40d38eb8ce96fe4959bcb7fac42 | |
| parent | 22b983f9864ba1a1a3849210370ffa0d8bb4364a (diff) | |
Fix Android build
Visibility attribute is not supported for Android X86. Therefore it's
removed for android.
Replace the slashes for declarative directories to copy files correctly.
Change-Id: I4be8a70cb7ef8f89040e455a61d27c2bb08d0a4d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| -rw-r--r-- | plugins/declarative/declarative.pri | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/declarative/declarative.pri b/plugins/declarative/declarative.pri index d183549a..e862809f 100644 --- a/plugins/declarative/declarative.pri +++ b/plugins/declarative/declarative.pri @@ -56,5 +56,5 @@ qmldir.path += $$IMPORT_INSTALL_PATH/$$TARGETPATH INSTALLS += target qmldir QMLDIR_FILE = $$_PRO_FILE_PWD_/qmldir -win32:QMLDIR_FILE = $$replace(QMLDIR_FILE, "/","\\") +contains(QMAKE_HOST.os, Windows): QMLDIR_FILE = $$replace(QMLDIR_FILE, "/","\\") QMAKE_POST_LINK += $$QMAKE_COPY $$QMLDIR_FILE $$DESTDIR diff --git a/src/src.pro b/src/src.pro index 26040992..7890c17d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -16,7 +16,7 @@ win32-msvc*: { # QMAKE_CXXFLAGS += -Werror } -unix:!qnx { +unix:!qnx:!android { QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden } |