Skip to content
Permalink
Browse files

[opencl] Translate message when no opencl is available

Plus Typos and code style
  • Loading branch information
elpaso committed Aug 8, 2018
1 parent 9ed9cbd commit 6317a068a51b3f4f1a14ebf8be53c03aa9b77e8e
Showing with 6 additions and 0 deletions.
  1. +6 −0 src/app/qgsoptions.cpp
@@ -1137,6 +1137,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
else
{
mGPUEnableCheckBox->setEnabled( false );
<<<<<<< 9ed9cbded8ecdd774739758493856a8bc1abb302
<<<<<<< 1324eff749a7b6102088ab77d27a5df6c6dce919
<<<<<<< 12fa896554321892e88ca05407cf125a7ccf92c1
mGPUInfoTextBrowser->setText( tr( "An OpenCL compatible device was not found on your system.<br>"
@@ -1152,6 +1153,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
"You may need to install additional libraries in order to enable OpenCL.<br>"
"Please check your logs for further details." ) );
>>>>>>> [opencl] Make opencl info copyable
=======
mGPUInfoTextBrowser->setText( tr( "An OpenCL compatible device was not found on your system.<br>"
"You may need to install additional libraries in order to enable OpenCL.<br>"
"Please check your logs for further details." ) );
>>>>>>> [opencl] Translate message when no opencl is available
}


0 comments on commit 6317a06

Please sign in to comment.
You can’t perform that action at this time.