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).
wilder
Michael Pyne 8 years ago
parent edf763ff6e
commit db8c751e19
  1. 2
      kdesrc-build
  2. 3
      modules/ksb/BuildSystem/QMake.pm

@ -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)

@ -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());

Loading…
Cancel
Save