Skip to content

Commit

Permalink
switched to QT 5.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
DrStS committed Dec 13, 2016
1 parent 70ae9b5 commit ff5a585
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ IF (${USE_INTEL_MKL})
find_package(MKL REQUIRED)
ENDIF()
IF (CMAKE_SYSTEM_NAME MATCHES "Windows")
SET(CMAKE_PREFIX_PATH "C:/software/libs/QT/QT561/5.6/msvc2013_64/lib/cmake")
SET(CMAKE_PREFIX_PATH "C:/software/libs/QT/QT570/5.7/msvc2013_64/lib/cmake")
ENDIF()
IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
SET(CMAKE_PREFIX_PATH "/home/stefan/software/tools/Qt/5.6/gcc_64/lib/cmake")
SET(CMAKE_PREFIX_PATH "/home/stefan/software/tools/Qt/5.7/gcc_64/lib/cmake")
ENDIF()
IF (${USE_QT5})
find_package(Qt5Widgets REQUIRED)
Expand Down
6 changes: 3 additions & 3 deletions etc/runWin64.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
echo Setting OpenCASCADE
call C:\software\libs\OpenCASCADE7.1.0-vc12-64\opencascade-7.1.0\env.bat vc12 win64 Release
echo Setting QT 5.6.1
set "PATH=C:\software\libs\QT\QT561\5.6\msvc2013_64\bin;%PATH%"
echo Setting QT 5.7.0
set "PATH=C:\software\libs\QT\QT570\5.7\msvc2013_64\bin;%PATH%"
echo Starting STACCATO ...
"..\bin64\Release\STACCATO.exe"
"..\bin64\Debug\STACCATO.exe"
1 change: 0 additions & 1 deletion src/Qt/OccViewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ class OccViewer : public QWidget
void mouseMoved(V3d_Coordinate X, V3d_Coordinate Y, V3d_Coordinate Z);
void pointClicked(V3d_Coordinate X, V3d_Coordinate Y, V3d_Coordinate Z);
void sendStatus(const QString aMessage);

void error(int errorCode, QString& errorDescription);

public slots:
Expand Down
2 changes: 1 addition & 1 deletion src/Qt/StartWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void StartWindow::createActions(void)
mExitAction->setShortcut(tr("Ctrl+Q"));
mExitAction->setIcon(QIcon(":/Qt/resources/close.png"));
mExitAction->setStatusTip(tr("Exit the application"));
connect(mExitAction, SIGNAL(triggered()), this, SLOT(onCloseWindow()));
connect(mExitAction, SIGNAL(triggered()), this, SLOT(close()));

mReadSTLAction = new QAction(tr("Read STL file"), this);
mReadSTLAction->setShortcut(tr("Ctrl+R"));
Expand Down

0 comments on commit ff5a585

Please sign in to comment.