Commit ae43cd88 authored by Christophe Giboudeaux's avatar Christophe Giboudeaux Committed by Fabian Vogt
Browse files

Revert "krdb: Call xrdb with -nocpp" to fix gitk runtime errors

This commit was preventing gitk from starting with
'unknown color name "BACKGROUND"' errors.

This reverts commit d360e3dc.

(cherry picked from commit f0764d87)
parent c70b49d1
...@@ -493,11 +493,11 @@ void runRdb( uint flags ) ...@@ -493,11 +493,11 @@ void runRdb( uint flags )
tmpFile.flush(); tmpFile.flush();
KProcess proc; KProcess proc;
proc << QStringLiteral("xrdb") << QStringLiteral("-nocpp") #ifndef NDEBUG
#ifdef NDEBUG proc << QStringLiteral("xrdb") << QStringLiteral("-merge") << tmpFile.fileName();
<< QStringLiteral("-quiet") #else
proc << "xrdb" << "-quiet" << "-merge" << tmpFile.fileName();
#endif #endif
<< QStringLiteral("-merge") << tmpFile.fileName();
proc.execute(); proc.execute();
applyGtkStyles(exportColors, 1); applyGtkStyles(exportColors, 1);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment