From d98a46df5ccf7b41441190c44583375ae65918e4 Mon Sep 17 00:00:00 2001 From: Atul R Date: Sun, 23 Feb 2020 00:30:05 +0100 Subject: [PATCH] fix config and download path for linux and windows --- config/qt.cmake | 2 +- {scripts => config}/qtConfig.js | 4 ++-- scripts/setupMiniQt.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename {scripts => config}/qtConfig.js (80%) diff --git a/config/qt.cmake b/config/qt.cmake index 44aa1a223..ad9487e93 100644 --- a/config/qt.cmake +++ b/config/qt.cmake @@ -6,7 +6,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(QTCONFIG_FILE ${CMAKE_CURRENT_LIST_DIR}/../scripts/qtConfig.js) +set(QTCONFIG_FILE ${CMAKE_CURRENT_LIST_DIR}/qtConfig.js) macro(AddQtSupport addonName) execute_process(COMMAND node -p "require('${QTCONFIG_FILE}').qtCmakeDir" diff --git a/scripts/qtConfig.js b/config/qtConfig.js similarity index 80% rename from scripts/qtConfig.js rename to config/qtConfig.js index e4a1f9066..e29fc4f5b 100644 --- a/scripts/qtConfig.js +++ b/config/qtConfig.js @@ -18,12 +18,12 @@ switch (os.platform()) { } case 'win32': { miniQt.qtHome = path.resolve(setupDir, miniQt.version, 'msvc2017_64'); - miniQt.downloadLink = `https://download.qt.io/online/qtsdkrepository/mac_x64/desktop/qt5_5150/qt.qt5.5150.clang_64/5.15.0-0-202002122005qtbase-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z`; + miniQt.downloadLink = `https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5150/qt.qt5.5150.win64_msvc2017_64/5.15.0-0-202002122017qtbase-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z`; break; } case 'linux': { miniQt.qtHome = path.resolve(setupDir, miniQt.version, 'gcc_64'); - miniQt.downloadLink = `https://download.qt.io/online/qtsdkrepository/mac_x64/desktop/qt5_5150/qt.qt5.5150.clang_64/5.15.0-0-202002122005qtbase-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z`; + miniQt.downloadLink = `https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150/qt.qt5.5150.gcc_64/5.15.0-0-202002122009qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z`; break; } } diff --git a/scripts/setupMiniQt.js b/scripts/setupMiniQt.js index ac0ab4457..000aed00a 100644 --- a/scripts/setupMiniQt.js +++ b/scripts/setupMiniQt.js @@ -1,7 +1,7 @@ #!/usr/bin/env node const { setupArtifact } = require('@nodegui/artifact-installer'); -const { miniQt, useCustomQt, qtHome } = require('./qtConfig'); +const { miniQt, useCustomQt, qtHome } = require('../config/qtConfig'); if (!useCustomQt) { console.log(`Minimal Qt ${miniQt.version} setup:`);