SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@753 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Бычков Андрей
2020-03-08 21:22:22 +00:00
parent a92bd7602f
commit 5950486596
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -28,7 +28,7 @@ else()
link_directories(/usr/local/lib) link_directories(/usr/local/lib)
endif() endif()
else() else()
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:\$ORIGIN/lib") set(CMAKE_INSTALL_RPATH "\$ORIGIN/lib")
endif() endif()
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
endif() endif()

1
qglview/qglview.cpp
View File

@@ -833,6 +833,7 @@ QByteArray QGLView::saveFeatures() {
QByteArray ba; QByteArray ba;
QDataStream ds(&ba, QIODevice::WriteOnly); QDataStream ds(&ba, QIODevice::WriteOnly);
ds << features_; ds << features_;
return ba;
} }