Skip to content

Resolve #4268 Update dependencies #4302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jodique2 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Resolve #4268 Update dependencies #4302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions INSTALL.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 5 additions & 6 deletions docker/Dockerfile.fedora
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand 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 \
Expand Down
2 changes: 1 addition & 1 deletion tools/deploy_fritzing_mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]}")
Expand Down
2 changes: 1 addition & 1 deletion tools/linguist_release.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tools/linguist_translate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tools/qt_installer_noninteractive.qs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
18 changes: 9 additions & 9 deletions tools/release_fritzing.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down