From 6d3c7e4d83b203aa31219c66ed0757f8daa083f6 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Sat, 21 Feb 2015 01:59:23 +0100 Subject: [PATCH] Add lib /yacreader/p7zip.so to YACReaderLibrary search path --- YACReaderLibrary/main.cpp | 2 +- custom_widgets/yacreader_gl_flow_config_widget.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/YACReaderLibrary/main.cpp b/YACReaderLibrary/main.cpp index 5f12d0f0..a883151f 100644 --- a/YACReaderLibrary/main.cpp +++ b/YACReaderLibrary/main.cpp @@ -95,7 +95,7 @@ void logSystemAndConfig() #ifdef Q_OS_WIN if(QLibrary::isLibrary(QApplication::applicationDirPath()+"/utils/7z.dll")) #elif defined Q_OS_UNIX && !defined Q_OS_MAC - if(QLibrary::isLibrary(QString(LIBDIR)+"/p7zip/7z.so")) + if(QLibrary::isLibrary(QString(LIBDIR)+"/yacreader/7z.so") | QLibrary::isLibrary(QString(LIBDIR)+"/p7zip/7z.so")) #else if(QLibrary::isLibrary(QApplication::applicationDirPath()+"/utils/7z.so")) #endif diff --git a/custom_widgets/yacreader_gl_flow_config_widget.cpp b/custom_widgets/yacreader_gl_flow_config_widget.cpp index 35e09a2c..d264d5fb 100644 --- a/custom_widgets/yacreader_gl_flow_config_widget.cpp +++ b/custom_widgets/yacreader_gl_flow_config_widget.cpp @@ -13,6 +13,7 @@ YACReaderGLFlowConfigWidget::YACReaderGLFlowConfigWidget(QWidget * parent /* = 0 */) :QWidget(parent) { + qDebug() << "Surface:" << QSurfaceFormat().majorVersion(); QVBoxLayout * layout = new QVBoxLayout(this); //PRESETS------------------------------------------------------------------