From 6853f888ebf1fc8b30805b16b05a6d356a25fec6 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 29 Oct 2012 11:22:17 +0100 Subject: use .qmake.conf instead of sync.profile as "anchor" this is less expensive, as qmake already provides us with it. Change-Id: Ifb44ea9126e6b52c02025858c5d88032e7a6cc2a Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_build_paths.prf | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf index 62a5a801f3..5f6f08c3db 100644 --- a/mkspecs/features/qt_build_paths.prf +++ b/mkspecs/features/qt_build_paths.prf @@ -1,13 +1,6 @@ # Find the module's source root dir. -MODULE_PROFILE_DIR = $$_PRO_FILE_PWD_ -for(ever) { - exists($$MODULE_PROFILE_DIR/sync.profile):break() - nmpri = $$dirname(MODULE_PROFILE_DIR) - equals(nmpri, $$MODULE_PROFILE_DIR):error("No sync.profile found. This does not look like a Qt module source tree.") - MODULE_PROFILE_DIR = $$nmpri - unset(nmpri) -} - +isEmpty(_QMAKE_CONF_): error("Project has no top-level .qmake.conf file.") +MODULE_PROFILE_DIR = $$dirname(_QMAKE_CONF_) isEmpty(MODULE_BASE_DIR): MODULE_BASE_DIR = $$MODULE_PROFILE_DIR isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_DIR) isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR -- cgit v1.2.3