From 654995d6aaca934bd70b5224e620096fff68def7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Thu, 17 Jun 2010 16:23:45 +0000 Subject: [PATCH] recent intel renderer strings are like 'Mesa DRI Intel(R) 965G GEM 20100328 2010Q1 x86/MMX/SSE2', having one more field from the end - fix reading version (bnc#605498) svn path=/trunk/KDE/kdebase/workspace/; revision=1139202 --- compositingprefs.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compositingprefs.cpp b/compositingprefs.cpp index 2aac0e9999..25ad819913 100644 --- a/compositingprefs.cpp +++ b/compositingprefs.cpp @@ -235,7 +235,10 @@ void CompositingPrefs::detectDriverAndVersion() { mDriver = "intel"; QStringList words = mGLRenderer.split(' '); - mVersion = Version( words[ words.count() - 2 ] ); + if( QRegExp( "[:digit:]+" ).exactMatch( words[ words.count() - 2 ] )) + mVersion = Version( words[ words.count() - 2 ] ); + else + mVersion = Version( words[ words.count() - 3 ] ); } else if( mGLVendor == "NVIDIA Corporation" ) {