From 8a247edfd8a5fc95146e862cd9d9e7907809c335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 19 Jun 2016 02:17:44 +0200 Subject: Revert "Add -nocpp option to be consistent with other usages of xrdb in source code." This reverts commit 41095d1c9c6055c782743d244508eb5a98d45625. This resolves bug 1375 (cherry picked from commit 142b3f67a6d5c44c5370eede8ce634ded89bbdf0) --- kcontrol/krdb/krdb.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kcontrol') diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index a1543a320..d01bd998e 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -558,9 +558,9 @@ void runRdb( uint flags ) TDEProcess proc; #ifndef NDEBUG - proc << "xrdb" << "-merge" << "-nocpp" << tmpFile.name(); + proc << "xrdb" << "-merge" << tmpFile.name(); #else - proc << "xrdb" << "-quiet" << "-merge" << "-nocpp" << tmpFile.name(); + proc << "xrdb" << "-quiet" << "-merge" << tmpFile.name(); #endif proc.start( TDEProcess::Block, TDEProcess::Stdin ); -- cgit v1.2.1