diff options
author | Andras Becsi <andras.becsi@digia.com> | 2013-08-29 16:15:00 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-08-30 12:59:43 +0200 |
commit | 005c952e0e2533c6366b16fa92971cf21b03b878 (patch) | |
tree | 3d9321697f6a8633a228a543f6b2777ae84bb159 | |
parent | b4fef95d6a3db3b5069716f9a256f0113b79f356 (diff) | |
download | qtwebengine-005c952e0e2533c6366b16fa92971cf21b03b878.tar.gz |
Fix the build on Mac with debug_and_release Qt
Remove the build_all option on Mac for now to prevent building
both debug and release libraries in the same run since it causes
linking issues with framework builds of Qt because of the
platform suffix of debug libraries.
Eventually the build system should be adapted to Mac specific
configurations.
Create unix binaries instead of app bundles to ease testing since
currently the examples need DYLD_LIBRARY_PATH to run.
Change-Id: I7fe3a7e6963510fb5a8863d9e68df487c168ff20
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
-rw-r--r-- | build/qmake/mkspecs/features/mac/default_post.prf | 2 | ||||
-rw-r--r-- | common.pri | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/build/qmake/mkspecs/features/mac/default_post.prf b/build/qmake/mkspecs/features/mac/default_post.prf new file mode 100644 index 000000000..2b9fed81b --- /dev/null +++ b/build/qmake/mkspecs/features/mac/default_post.prf @@ -0,0 +1,2 @@ +CONFIG -= build_all +load(default_post) diff --git a/common.pri b/common.pri index 844ef5edb..5f4dbc3bc 100644 --- a/common.pri +++ b/common.pri @@ -1,6 +1,8 @@ macx:LIBPATH = $$getOutDir()/$$getConfigDir() else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib +macx: CONFIG -= app_bundle + # Allows examples/tests to link to libQt5WebEngineCore which # isn't deployed properly yet. QMAKE_RPATHDIR += $$LIBPATH |