summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-03-13 11:23:17 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-03-13 11:23:17 -0500
commit41095d1c9c6055c782743d244508eb5a98d45625 (patch)
treec6bc8beb24e87da4bb4f12fb7ef694887839af6e /kcontrol
parent14b7d88851378ac5ee85198634a984a665668237 (diff)
downloadtdebase-41095d1c9c6055c782743d244508eb5a98d45625.tar.gz
tdebase-41095d1c9c6055c782743d244508eb5a98d45625.zip
Add -nocpp option to be consistent with other usages of xrdb in source code.
Diffstat (limited to 'kcontrol')
-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 d966af4c..3971927d 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -558,9 +558,9 @@ void runRdb( uint flags )
KProcess proc;
#ifndef NDEBUG
- proc << "xrdb" << "-merge" << tmpFile.name();
+ proc << "xrdb" << "-merge" << "-nocpp" << tmpFile.name();
#else
- proc << "xrdb" << "-quiet" << "-merge" << tmpFile.name();
+ proc << "xrdb" << "-quiet" << "-merge" << "-nocpp" << tmpFile.name();
#endif
proc.start( KProcess::Block, KProcess::Stdin );