[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Michael Weghorn (via logerrit)]

 bin/gbuild-to-ide |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 78f6cafe6636f52e95d4f815fff44cde34d30528
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Feb 25 14:17:30 2021 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri Feb 26 08:56:10 2021 +0100

    qtcreator: Use absolute paths in *.pro files
    
    ... as a preparation to make this work
    for the srcdir != builddir case as well.
    
    Change-Id: I87507b9866f97cdbdf848c6b187b3b8f17262b6d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111552
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 3ee79977e78f..6d10f661e097 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -1660,15 +1660,15 @@ class QtCreatorIntegrationGenerator(IdeIntegrationGenerator):
             lib_folder = os.path.relpath(lib.location, self.base_folder)
 
             def lopath(path):
-                if platform =="cygwin":
+                if platform == "cygwin":
                     # absolute paths from GbuildToJson are Windows paths,
                     # so convert everything to such ones
                     abs_path = path
                     if not ntpath.isabs(abs_path):
                         abs_path = ntpath.join(self.gbuildparser.srcdir, path)
-                    return ntpath.relpath(abs_path, lib.location).replace('\\', '/')
+                    return abs_path.replace('\\', '/')
 
-                return os.path.relpath(path, lib.location)
+                return os.path.abspath(path)
 
             defines_list = []
             sources_list = []