SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

QucsActivefilter compiles and runs with Qt5

Browse Source
This commit is contained in:
Vadim Kuznetsov 2022-02-14 22:31:30 +01:00
parent 680e69e3e2
commit 51831a58e0
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qucs-activefilter/CMakeLists.txt
View File

@ -35,11 +35,18 @@ CONFIGURE_FILE (
INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
FIND_PACKAGE( Qt4 REQUIRED )
SET( QT_USE_QTGUI TRUE )
SET( QT_USE_QTSVG TRUE )
FIND_PACKAGE( Qt5 COMPONENTS Core Gui Widgets Svg REQUIRED)
#INCLUDE( ${QT_USE_FILE} )
INCLUDE_DIRECTORIES(
${Qt5Core_INCLUDE_DIRS}
${Qt5Widgets_INCLUDE_DIRS}
${Qt5Svg_INCLUDE_DIRS}
)
# bug, the find package does not seem to set the QT_LIBRARIES, do it manually
SET(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Svg_LIBRARIES} )
INCLUDE( ${QT_USE_FILE} )
ADD_DEFINITIONS(${QT_DEFINITIONS})
@ -61,10 +68,10 @@ qucsactivefilter.h
helpdialog.h
)
QT4_WRAP_CPP(QUCS-ACTIVE-FILTER_MOC_SRCS ${QUCS-ACTIVE-FILTER_MOC_HDRS})
QT5_WRAP_CPP(QUCS-ACTIVE-FILTER_MOC_SRCS ${QUCS-ACTIVE-FILTER_MOC_HDRS})
SET(RESOURCES qucsactivefilter.qrc)
QT4_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES})
QT5_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES})
IF(APPLE)

10
qucs-activefilter/qucsactivefilter.cpp
View File

@ -41,14 +41,14 @@ QucsActiveFilter::QucsActiveFilter(QWidget *parent)
setWindowIcon(QPixmap(":/images/bitmaps/big.qucs.xpm"));
setWindowTitle("Qucs Active Filter " PACKAGE_VERSION);
QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
//QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
// -------- create menubar -------------------
QMenu *fileMenu = new QMenu(tr("&File"));
QAction * fileQuit = new QAction(tr("E&xit"), this);
fileQuit->setShortcut(Qt::CTRL+Qt::Key_Q);
connect(fileQuit, SIGNAL(activated()), SLOT(close()));
connect(fileQuit, SIGNAL(triggered(bool)), SLOT(close()));
fileMenu->addAction(fileQuit);
@ -66,15 +66,15 @@ QucsActiveFilter::QucsActiveFilter(QWidget *parent)
QMenu *helpMenu = new QMenu(tr("&Help"), this);
QAction * helpHelp = new QAction(tr("Help..."), this);
helpHelp->setShortcut(Qt::Key_F1);
connect(helpHelp, SIGNAL(activated()), SLOT(slotHelpIntro()));
connect(helpHelp, SIGNAL(triggered(bool)), SLOT(slotHelpIntro()));
QAction * helpAbout = new QAction(tr("&About QucsActiveFilter..."), this);
helpMenu->addAction(helpAbout);
connect(helpAbout, SIGNAL(activated()), SLOT(slotHelpAbout()));
connect(helpAbout, SIGNAL(triggered(bool)), SLOT(slotHelpAbout()));
QAction * helpAboutQt = new QAction(tr("About Qt..."), this);
helpMenu->addAction(helpAboutQt);
connect(helpAboutQt, SIGNAL(activated()), SLOT(slotHelpAboutQt()));
connect(helpAboutQt, SIGNAL(triggered(bool)), SLOT(slotHelpAboutQt()));
helpMenu->addAction(helpHelp);
helpMenu->addSeparator();

2
qucs-activefilter/transferfuncdialog.h
View File

@ -18,8 +18,8 @@
#ifndef TRANSFERFUNCDIALOG_H
#define TRANSFERFUNCDIALOG_H
#include <QWidget>
#include <QtGui>
#include <QtWidgets>
class TransferFuncDialog : public QDialog
{