[Gammaray-interest] Fwd: building GammaRay on OS X

[Allen Winter]

On Thursday, May 28, 2015 07:21:25 PM René J.V. Bertin wrote:
> On Thursday May 28 2015 12:47:10 Allen Winter wrote:
> 
> > Depending on the triviality we would ask you
> 
> I think it can hardly get less trivial than this :)
> 
Thanks.
Committed to the master and 2.2 branches.

> 
> diff --git a/launcher/injector/injectorfactory.cpp b/launcher/injector/injectorfactory.cpp
> index 4464859..ae26cfa 100644
> --- a/launcher/injector/injectorfactory.cpp
> +++ b/launcher/injector/injectorfactory.cpp
> @@ -77,7 +77,7 @@ AbstractInjector::Ptr defaultInjectorForLaunch(const ProbeABI &abi)
>  #if defined(Q_OS_MAC)
>    if (abi.majorQtVersion() >= 5 && abi.minorQtVersion() >= 4)
>      return createInjector(QLatin1String("preload"));
> -  return findFirstWorkingInjector(QStringList() << QLatin1String("gdb") << QLatin1String("lldb"));
> +  return findFirstWorkingInjector(QStringList() << QLatin1String("lldb") << QLatin1String("gdb"));
>  #elif defined(Q_OS_UNIX)
>    Q_UNUSED(abi);
>    return createInjector(QLatin1String("preload"));
> @@ -89,7 +89,9 @@ AbstractInjector::Ptr defaultInjectorForLaunch(const ProbeABI &abi)
>  
>  AbstractInjector::Ptr defaultInjectorForAttach()
>  {
> -#ifndef Q_OS_WIN
> +#ifdef Q_OS_MAC
> +  return findFirstWorkingInjector(QStringList() << QLatin1String("lldb") << QLatin1String("gdb"));
> +#elif !defined(Q_OS_WIN)
>    return findFirstWorkingInjector(QStringList() << QLatin1String("gdb") << QLatin1String("lldb"));
>  #else
>    return createInjector(QLatin1String("windll"));
> 
> _______________________________________________
> Gammaray-interest mailing list
> Gammaray-interest at mail.kdab.com
> https://mail.kdab.com/mailman/listinfo/gammaray-interest

-- 
Allen Winter | allen.winter at kdab.com | Senior Software Engineer
KDAB (USA) LLC, a KDAB Group company
Tel. USA +1-866-777-KDAB(5322) ext3
KDAB - The Qt Experts
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5905 bytes
Desc: not available
URL: <http://mail.kdab.com/pipermail/gammaray-interest/attachments/20150528/98bac874/attachment-0001.p7s>