From db8c751e197c56cc952476b55ce68375e99f575d Mon Sep 17 00:00:00 2001 From: Michael Pyne Date: Sun, 5 Nov 2017 11:45:14 -0500 Subject: [PATCH] qmake: Improve Qt5 build support. Qt5 modules built from git rely on git information being available to generate private headers and the like, so don't strip out the .git directly when using builddir hack. Likewise, using the "-r" flag to force a full recursive search for .pro files causes qmake to error out on some modules where the .pro isn't meant to be built as part of the module build (e.g. examples). --- kdesrc-build | 2 -- modules/ksb/BuildSystem/QMake.pm | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/kdesrc-build b/kdesrc-build index 4a96eb5..54dc1b3 100755 --- a/kdesrc-build +++ b/kdesrc-build @@ -117,8 +117,6 @@ sub safe_lndir # Ignore the .svn directory and files. return if $dir =~ m,/\.svn,; - return if $dir =~ m,/\.git,; - return if $dir =~ m,/\.bzr,; # Create the directory. if (not -e $dir) diff --git a/modules/ksb/BuildSystem/QMake.pm b/modules/ksb/BuildSystem/QMake.pm index f9d6213..8bbb0f1 100644 --- a/modules/ksb/BuildSystem/QMake.pm +++ b/modules/ksb/BuildSystem/QMake.pm @@ -59,8 +59,7 @@ sub configureInternal ? $builddir : $module->fullpath('source'); - # -r forces recursive configuration - my @qmakeOpts = ('-r', split(' ', $module->getOption('qmake-options'))); + my @qmakeOpts = split(' ', $module->getOption('qmake-options')); my @projectFiles = glob("$sourcedir/*.pro"); @projectFiles = ("$module.pro") if (!@projectFiles && pretending());