Merge remote-tracking branch 'origin/1.9' into master

Change-Id: Ib18e50ecdc9be5f9deaebf68414c2082ddafcc8b

8 files changed, 13 insertions, 12 deletions

diff --git a/docker/windowsservercore/Dockerfile b/docker/windowsservercore/Dockerfile
index 942ecbd2b..561116c3f 100644
--- a/docker/windowsservercore/Dockerfile
+++ b/docker/windowsservercore/Dockerfile
@@ -22,7 +22,7 @@ RUN @powershell -NoProfile -ExecutionPolicy Bypass -Command \
     $Env:chocolateyVersion = '0.10.5' ; \
     $Env:chocolateyUseWindowsCompression = 'false' ; \
     "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
-RUN choco install -y qbs --version 1.8.1 && qbs --version
+RUN choco install -y qbs --version 1.9.0 && qbs --version
 RUN choco install -y unzip --version 6.0 && unzip -v
 RUN choco install -y visualcpp-build-tools --version 14.0.25420.1 && dir "%PROGRAMFILES(X86)%\Microsoft Visual C++ Build Tools"
 RUN choco install -y zip --version 3.0 && zip -v
diff --git a/qbs.pro b/qbs.pro
index 5d59d8733..8ecfbff70 100644
--- a/qbs.pro
+++ b/qbs.pro
@@ -50,7 +50,8 @@ SUBDIRS += \
 OTHER_FILES += \
     doc/*.qdoc \
     doc/reference/*.qdoc \
-    doc/reference/items/*.qdoc \
+    doc/reference/items/convenience/*.qdoc \
+    doc/reference/items/language/*.qdoc \
     doc/reference/jsextensions/*.qdoc \
     doc/reference/modules/*.qdoc \
     doc/qbs.qdocconf \
diff --git a/scripts/make-release-archives.bat b/scripts/make-release-archives.bat
index 19e06bcec..865efb2fd 100644
--- a/scripts/make-release-archives.bat
+++ b/scripts/make-release-archives.bat
@@ -63,10 +63,10 @@ if exist "%QTDIR64%" (
 REM Work around QBS-1142, where symlinks to UNC named paths aren't resolved
 REM properly, for example if this command is being run in a Docker container
 REM where the current directory is a symlink
-(robocopy "%CD%" "%builddir%\source" /e /njh /njs /ndl /nc /ns /xd .git) ^& IF %ERRORLEVEL% GTR 1 exit %ERRORLEVEL%
+subst Q: "%CD%" && Q:
 
 qbs build --settings-dir "%builddir%\.settings"^
- -f "%builddir%\source" -d "%builddir%\build"^
+ -f qbs.qbs -d "%builddir%\build"^
  -p dist qbs.buildVariant:release "products.qbs archive.includeTopLevelDir:true"^
  release "qbs.installRoot:%builddir%\qbs-windows-x86-%version%" profile:qt^
  release-64 "qbs.installRoot:%builddir%\qbs-windows-x86_64-%version%" profile:qt64 || exit /b
diff --git a/share/qbs/modules/dmg/DMGModule.qbs b/share/qbs/modules/dmg/DMGModule.qbs
index b45f9d548..09e31f696 100644
--- a/share/qbs/modules/dmg/DMGModule.qbs
+++ b/share/qbs/modules/dmg/DMGModule.qbs
@@ -76,9 +76,6 @@ Module {
     readonly property string pythonPath: File.canonicalFilePath(FileInfo.joinPaths(path,
                                                                 "..", "..",
                                                                 "python"))
-    readonly property string libexecPath: File.canonicalFilePath(FileInfo.joinPaths(path,
-                                                                 "..", "..", "..", "..",
-                                                                 "libexec", "qbs"))
 
     property string backgroundColor
     property int iconSize: 128
diff --git a/share/qbs/modules/dmg/dmg.js b/share/qbs/modules/dmg/dmg.js
index 82b701434..4d972db9b 100644
--- a/share/qbs/modules/dmg/dmg.js
+++ b/share/qbs/modules/dmg/dmg.js
@@ -199,7 +199,7 @@ function prepareDmg(project, product, inputs, outputs, input, output) {
     cmds.push(cmd);
 
     // Create the actual DMG via dmgbuild
-    cmd = new Command(FileInfo.joinPaths(product.dmg.libexecPath, "dmgbuild"),
+    cmd = new Command(FileInfo.joinPaths(product.qbs.libexecPath, "dmgbuild"),
                       [product.dmg.volumeName,
                        output.filePath,
                        "--no-hidpi", // qbs handles this by itself
diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp
index 9d49a5c0e..b5e1ddd9d 100644
--- a/src/lib/corelib/api/projectdata.cpp
+++ b/src/lib/corelib/api/projectdata.cpp
@@ -656,7 +656,7 @@ bool operator<(const ProductData &lhs, const ProductData &rhs)
     if (nameCmp > 0)
         return false;
     return lhs.profile() < rhs.profile()
-            && lhs.multiplexConfigurationId() < lhs.multiplexConfigurationId();
+            && lhs.multiplexConfigurationId() < rhs.multiplexConfigurationId();
 }
 
 /*!
diff --git a/src/lib/corelib/jsextensions/textfile.cpp b/src/lib/corelib/jsextensions/textfile.cpp
index 7ce575408..bfa2b12d2 100644
--- a/src/lib/corelib/jsextensions/textfile.cpp
+++ b/src/lib/corelib/jsextensions/textfile.cpp
@@ -174,11 +174,11 @@ void TextFile::close()
 {
     if (checkForClosed())
         return;
+    delete m_stream;
+    m_stream = 0;
     m_file->close();
     delete m_file;
     m_file = 0;
-    delete m_stream;
-    m_stream = 0;
 }
 
 QString TextFile::filePath()
diff --git a/static.pro b/static.pro
index 562b68303..39ffb387f 100644
--- a/static.pro
+++ b/static.pro
@@ -54,7 +54,10 @@ OTHER_FILES += $$FILES $$LIBEXEC_FILES
 
 !isEqual(PWD, $$OUT_PWD) {
     libexec_copy.input = LIBEXEC_FILES
-    libexec_copy.output = libexec/qbs/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
+    !isEmpty(QBS_LIBEXEC_DESTDIR): \
+        libexec_copy.output = $${QBS_LIBEXEC_DESTDIR}/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
+    else: \
+        libexec_copy.output = libexec/qbs/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
     libexec_copy.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
     libexec_copy.name = COPY ${QMAKE_FILE_IN}
     libexec_copy.CONFIG += no_link target_predeps