diff --git a/INSTALL.txt b/INSTALL.txt index 2b3f2713d..e54df150e 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -21,10 +21,9 @@ To start Fritzing on Windows: Wait until unzipping is finished. Then open the de ## Notes on Linux To start Fritzing double-click Fritzing, or try ./Fritzing in your shell window -Fritzing uses the Qt5 libraries. On Ubuntu, they can be installed like this: - -"sudo apt install libqt5printsupport5 libqt5xml5 libqt5sql5 libqt5serialport5 libqt5sql5-sqlite". +Fritzing uses the Qt6 libraries. On Ubuntu, they can be installed like this: +"sudo apt install libqt6printsupport6 libqt6xml6 libqt6sql6 libqt6serialport6 libqt6sql6-sqlite ## Notes on macOS To start Fritzing on macOS double-click the Fritzing application diff --git a/docker/Dockerfile.fedora b/docker/Dockerfile.fedora index 933d7a81a..66f0af96a 100644 --- a/docker/Dockerfile.fedora +++ b/docker/Dockerfile.fedora @@ -1,13 +1,12 @@ -FROM fedora:30 +FROM fedora:39 RUN dnf -y install cmake wget git flex bison libudev-devel RUN dnf -y install make gcc gcc-c++ kernel-devel ncurses-devel RUN dnf -y install openssl-devel zlib-devel libjpeg-devel libpng-devel bzip2 libgit2-devel boost-devel -RUN dnf -y install xorg-x11-server-Xvfb qt-creator qt5-devel +RUN dnf -y install xorg-x11-server-Xvfb qt-creator qt6-qtbase-devel qt6-qtserialport-devel qt6-qtsvg-devel -RUN ln -s /usr/bin/qmake-qt5 /usr/bin/qmake -RUN ln -s /usr/bin/lrelease-qt5 /usr/bin/lrelease +RUN ln -s /usr/bin/lrelease-qt6 /usr/bin/lrelease RUN dnf clean all @@ -23,8 +22,8 @@ WORKDIR /home/conan USER conan # No SHA verification for now. Will be automated by Conan in the future. -RUN set -xe \ - && wget -q -O - https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 | tar xj +# RUN set -xe \ +# && wget -q -O - https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 | tar xj RUN set -xe \ && wget -q -O - https://github.com/libgit2/libgit2/archive/v0.28.1.tar.gz | tar xz \ diff --git a/tools/deploy_fritzing_mac.sh b/tools/deploy_fritzing_mac.sh index 8323077e8..f2a816c3e 100755 --- a/tools/deploy_fritzing_mac.sh +++ b/tools/deploy_fritzing_mac.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -QTBIN=/usr/local/opt/qt5/bin +QTBIN=/usr/local/opt/qt6/bin # Go to this scripts directory and then one up toolsdir=$(dirname "${BASH_SOURCE[0]}") diff --git a/tools/linguist_release.bat b/tools/linguist_release.bat index ce514c295..2cc1304d8 100644 --- a/tools/linguist_release.bat +++ b/tools/linguist_release.bat @@ -1,3 +1,3 @@ cd %~dp0 cd .. -C:\Qt\Qt5.6.2\5.6\msvc2013_64\bin\lrelease -removeidentical phoenix.pro +C:\Qt\Qt6.5.3\5.3\msvc2013_64\bin\lrelease -removeidentical phoenix.pro diff --git a/tools/linguist_translate.bat b/tools/linguist_translate.bat index 16093e264..5be274104 100644 --- a/tools/linguist_translate.bat +++ b/tools/linguist_translate.bat @@ -1,3 +1,3 @@ cd %~dp0 cd .. -C:\Qt\Qt5.6.2\5.6\msvc2013_64\bin\lupdate -noobsolete phoenix.pro +C:\Qt\Qt6.5.3\5.3\msvc2013_64\bin\lupdate -noobsolete phoenix.pro diff --git a/tools/qt_installer_noninteractive.qs b/tools/qt_installer_noninteractive.qs index 7c61f555e..a5e19bb52 100644 --- a/tools/qt_installer_noninteractive.qs +++ b/tools/qt_installer_noninteractive.qs @@ -31,12 +31,12 @@ Controller.prototype.ComponentSelectionPageCallback = function() { var widget = gui.currentPageWidget(); widget.deselectAll(); - //widget.selectComponent("qt.qt5.5123.win32_msvc2017"); - widget.selectComponent("qt.qt5.5127.win64_msvc2017_64"); + //widget.selectComponent("qt.qt6.5123.win32_msvc2017"); + widget.selectComponent("qt.qt6.5127.win64_msvc2017_64"); // Cannot get older version of Qt qit Quick Scripts // Cannot programatically select LTS releases -// widget.selectComponent("qt.qt5.598.win64_msvc2017_64"); +// widget.selectComponent("qt.qt6.598.win64_msvc2017_64"); // Selecting invalid components results in installing just QtCreator. gui.clickButton(buttons.NextButton); diff --git a/tools/release_fritzing.bat b/tools/release_fritzing.bat index a8958c673..30d570202 100644 --- a/tools/release_fritzing.bat +++ b/tools/release_fritzing.bat @@ -118,15 +118,15 @@ echo. echo copy qt libraries copy %QTBIN%\libEGL.dll %DESTDIR%\deploy\libEGL.dll copy %QTBIN%\libGLESv2.dll %DESTDIR%\deploy\libGLESv2.dll -copy %QTBIN%\Qt5Core.dll %DESTDIR%\deploy\Qt5Core.dll -copy %QTBIN%\Qt5Gui.dll %DESTDIR%\deploy\Qt5Gui.dll -copy %QTBIN%\Qt5Network.dll %DESTDIR%\deploy\Qt5Network.dll -copy %QTBIN%\Qt5PrintSupport.dll %DESTDIR%\deploy\Qt5PrintSupport.dll -copy %QTBIN%\Qt5Sql.dll %DESTDIR%\deploy\Qt5Sql.dll -copy %QTBIN%\Qt5Svg.dll %DESTDIR%\deploy\Qt5Svg.dll -copy %QTBIN%\Qt5Widgets.dll %DESTDIR%\deploy\Qt5Widgets.dll -copy %QTBIN%\Qt5Xml.dll %DESTDIR%\deploy\Qt5Xml.dll -copy %QTBIN%\Qt5SerialPort.dll %DESTDIR%\deploy\Qt5SerialPort.dll +copy %QTBIN%\Qt6Core.dll %DESTDIR%\deploy\Qt6Core.dll +copy %QTBIN%\Qt6Gui.dll %DESTDIR%\deploy\Qt6Gui.dll +copy %QTBIN%\Qt6Network.dll %DESTDIR%\deploy\Qt6Network.dll +copy %QTBIN%\Qt6PrintSupport.dll %DESTDIR%\deploy\Qt6PrintSupport.dll +copy %QTBIN%\Qt6Sql.dll %DESTDIR%\deploy\Qt6Sql.dll +copy %QTBIN%\Qt6Svg.dll %DESTDIR%\deploy\Qt6Svg.dll +copy %QTBIN%\Qt6Widgets.dll %DESTDIR%\deploy\Qt6Widgets.dll +copy %QTBIN%\Qt6Xml.dll %DESTDIR%\deploy\Qt6Xml.dll +copy %QTBIN%\Qt6SerialPort.dll %DESTDIR%\deploy\Qt6SerialPort.dll xcopy /q %QTBIN%\icu*.dll %DESTDIR%\deploy /E /I