1. 20 May, 2019 - 1 commit
  2. 22 May, 2019 - 1 commit
  3. 20 May, 2019 - 1 commit
    • Joerg Bornemann's avatar
      Replace absolute Qt lib dir in .prl files · f00de332
      Joerg Bornemann authored
      
      In the case of building a Qt module repository against an installed
      qtbase the .prl files contain absolute paths to Qt dependencies e.g.
      '/install-prefix/lib/libQt5Core.so'.
      
      Those must be replaced with $$[QT_INSTALL_PREFIX]. The .prl
      replacement code however only takes $$MODULE_BASE_OUTDIR/lib into
      account.
      
      Fixes: QTBUG-75804
      Change-Id: I5ea5623ca7396b672fded3f1b9434b9ad5ed12ec
      Reviewed-by: default avatarOliver Wolff <oliver.wolff@qt.io>
       
       
      f00de332
  4. 09 May, 2019 - 1 commit
  5. 14 May, 2019 - 8 commits
  6. 13 May, 2019 - 2 commits
    • Kai Koehne's avatar
      qmake: Escape trailing backslash for OBJECTS_DIR for MinGW · bac2b0ef
      Kai Koehne authored
      
      qmake automatically appends a dir_sep to a few directory paths (see
      MakefileGenerator::initOutPaths), and various .pri and .prf files rely on
      that. Anyhow, for non-MSys MinGW on Windows this creates a problem,
      because mingw32-make will interpret the backslash in
      
        OBJECTS_DIR = some_path\
      
      to escape the following newline. We have been working around this
      problem in various ways:
      
      - winmakefile.cpp just removes the trailing \ for OBJECTS_DIR, at the
        cost of not being compatible with logic in .prf/.pri files that rely on
        the separator.
      - winmakefile.cpp adds a '#avoid trailing-slash linebreak' comment for
        DESTDIR.  Anyhow, this does not seem to work for mingw32-make: If you
        reference $(DESTDIR), the variable will contain trailing spaces.
      - unixmakefile2.cpp duplicates a trailing \ for DESTDIR.
      
      The last approach is now taken also for OBJECTS_DIR.
      
      Task-number: QTBUG-75257
      Change-Id: Ie8171a990a9ce1cfbf1b94037252ef2392313338
      Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@qt.io>
      bac2b0ef
    • Kai Koehne's avatar
      Fix emar invocation on Windows for MinGW · 9dbbccf7
      Kai Koehne authored
      If qmake is called without sh.exe in PATH, the relative paths
      in OBJECTS will contain backslashes as separator.
      
      Anyhow, emar needs forward slashes. Use GNU make's subst command
      to fix this.
      
      This amends  22c1e10e
      
      .
      
      Task-number: QTBUG-75257
      Change-Id: Iacc6fe69cf470f35c6ddd829be7a80944346452d
      Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@qt.io>
      9dbbccf7
  7. 08 May, 2019 - 3 commits
  8. 07 May, 2019 - 4 commits
  9. 06 May, 2019 - 3 commits
  10. 05 May, 2019 - 5 commits
  11. 03 May, 2019 - 8 commits
  12. 02 May, 2019 - 3 commits