Merge branch 'ra3xdh:current' into current

ra3xdh · Oct 24, 2024 · f63b6de · f63b6de
2 parents a89549e + 8fc712e
commit f63b6de
Show file tree

Hide file tree

Showing 112 changed files with 1,440 additions and 304 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -64,7 +64,6 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libglx-dev libgl1-mesa-dev flex bison gperf dos2unix flex bison gperf dos2unix
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12
-          sudo apt install libqt5charts5-dev
 
     - name: 'Install Qt6'
       uses: jurplel/install-qt-action@v4
@@ -212,7 +211,7 @@ jobs:
 
 
   build-mac-universal:
-    runs-on: macos-latest
+    runs-on: macos-15
     needs: setup
     strategy:
       fail-fast: false

diff --git a/README.md b/README.md
@@ -34,13 +34,13 @@ Use CMake to build Qucs-S. Install all necessary dependencies: GCC, Qt, Flex, Bi
 #### Ubuntu
 
 ~~~
-sudo apt-get install ngspice build-essential git cmake qtbase5-dev qttools5-dev libqt5svg5-dev flex bison gperf dos2unix
+sudo apt-get install ngspice build-essential git cmake qtbase5-dev qttools5-dev libqt5svg5-dev libqt5charts5-dev flex bison gperf dos2unix
 ~~~
 
 #### OpenSUSE Tumbleweed
 
 ~~~
-sudo zypper install ngspice git cmake libqt5-qtbase-devel libqt5-qttools-devel libqt5-qtsvg-devel flex bison gperf dos2unix
+sudo zypper install ngspice git cmake libqt5-qtbase-devel libqt5-qttools-devel libqt5-qtsvg-devel libqt5-qtcharts-devel flex bison gperf dos2unix
 ~~~
 
 ### Compiling

diff --git a/qucs-powercombining/qucspowercombiningtool.cpp b/qucs-powercombining/qucspowercombiningtool.cpp
@@ -787,7 +787,7 @@ QString QucsPowerCombiningTool::calcChebyLines(double RL, double Z0, double gamm
     {
         QMessageBox::warning(0, QObject::tr("Error"),
                              QObject::tr("Chebyshev weighting for N>7 is not available"));
-        return QString("");
+        return QString();
     }
     QString s;
     double sec_theta_m;// = cosh((1/(1.*N))*acosh((1/gamma)*fabs((RL-Z0)/(Z0+RL))) );
@@ -2065,7 +2065,7 @@ QString QucsPowerCombiningTool::ConvertLengthFromM(double len)
           return QString("%1 mm").arg(RoundVariablePrecision(conv));
   }
   }while(true);
-  return QString("");
+  return QString();
 }
 
 // Copied from Qucs misc class

diff --git a/qucs-s-spar-viewer/main.cpp b/qucs-s-spar-viewer/main.cpp
@@ -108,7 +108,7 @@ int main( int argc, char ** argv )
   qucs->move(QucsSettings.x, QucsSettings.y);  // position before "show" !!!
   qucs->show();
 
-  QScreen* primaryScreen = QGuiApplication::screens().first();
+  QScreen* primaryScreen = QGuiApplication::screens().constFirst();
 
   qucs->resize(primaryScreen->availableGeometry().size() * 0.9);
   qucs->setGeometry(