From 87dab59e8e56b47e7a35078a14a87e0f9355af05 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Fri, 29 Nov 2013 17:00:01 +0100 Subject: Use the process we install to libexec Via QLibraryInfo. Also pick the name from qmake, and drop the hardcoded value. Add better error reporting when this fails. Change-Id: I44891a16f079b6c3c334f7f2bafa9edc0b4d69e4 Reviewed-by: Andras Becsi --- tools/qmake/mkspecs/features/gyp_generator.prf | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'tools/qmake/mkspecs') diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf index 6ae886a33..e41b2de50 100644 --- a/tools/qmake/mkspecs/features/gyp_generator.prf +++ b/tools/qmake/mkspecs/features/gyp_generator.prf @@ -119,20 +119,6 @@ GYP_CONTENTS += " ]," \ for (define, DEFINES): GYP_CONTENTS += " '$$define'," GYP_CONTENTS += " ]," } -!isEmpty(PER_CONFIG_DEFINES) { - GYP_CONTENTS += " 'configurations': {"\ - " 'Release': {" \ - " 'defines': [" - for (define, PER_CONFIG_DEFINES): GYP_CONTENTS += " '$$replace(define,%config,Release)'," - GYP_CONTENTS += " ]," \ - " }," \ - " 'Debug': {" \ - " 'defines': [" - for (define, PER_CONFIG_DEFINES): GYP_CONTENTS += " '$$replace(define,%config,Debug)'," - GYP_CONTENTS += " ]," \ - " }," \ - " }," -} !isEmpty(GYP_DYLIB_INSTALL_NAME_BASE) { GYP_CONTENTS += " 'xcode_settings': {" \ " 'DYLIB_INSTALL_NAME_BASE': '$$GYP_DYLIB_INSTALL_NAME_BASE'," \ -- cgit v1.2.3