summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-06-19 02:17:44 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-06-19 02:17:44 +0200
commit142b3f67a6d5c44c5370eede8ce634ded89bbdf0 (patch)
treebee805a3de12ff764d63083049ad903c088dd895
parent193cb78c574a1fd1f27a5103275c39d992c67295 (diff)
downloadtdebase-142b3f67.tar.gz
tdebase-142b3f67.zip
Revert "Add -nocpp option to be consistent with other usages of xrdb in source code."
This reverts commit 41095d1c9c6055c782743d244508eb5a98d45625. This resolves bug 1375
-rw-r--r--kcontrol/krdb/krdb.cpp4
1 files changed, 2 insertions, 2 deletions
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 );