Commit f0764d87 authored by Christophe Giboudeaux's avatar Christophe Giboudeaux

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.
parent bbc104a0
......@@ -493,11 +493,11 @@ void runRdb( uint flags )
tmpFile.flush();
KProcess proc;
proc << QStringLiteral("xrdb") << QStringLiteral("-nocpp")
#ifdef NDEBUG
<< QStringLiteral("-quiet")
#ifndef NDEBUG
proc << QStringLiteral("xrdb") << QStringLiteral("-merge") << tmpFile.fileName();
#else
proc << "xrdb" << "-quiet" << "-merge" << tmpFile.fileName();
#endif
<< QStringLiteral("-merge") << tmpFile.fileName();
proc.execute();
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