Ticket #44236: krdb-noX11onOSX.patch

File krdb-noX11onOSX.patch, 852 bytes (added by RJVB (René Bertin), 10 years ago)
  • kcontrol/krdb/

    old new  
    517517
    518518    if( cfgfonts.readEntry( "forceFontDPI", 0 ) != 0 )
    519519      contents += "Xft.dpi: " + cfgfonts.readEntry( "forceFontDPI" ) + '\n';
     520#ifdef Q_WS_X11
    520521    else
    521522    {
    522523      KProcess proc;
     
    529530        proc.waitForFinished();
    530531      }
    531532    }
     533#endif // Q_WS_X11
    532534  }
    533535
    534536  if (contents.length() > 0)
     
    536538
    537539  tmpFile.flush();
    538540
     541#ifdef Q_WS_X11
    539542  KProcess proc;
    540 #ifndef NDEBUG
     543#   ifndef NDEBUG
    541544  proc << "xrdb" << "-merge" << tmpFile.fileName();
    542 #else
     545#   else
    543546  proc << "xrdb" << "-quiet" << "-merge" << tmpFile.fileName();
    544 #endif
     547#   endif
    545548  proc.execute();
     549#endif // Q_WS_X11
    546550
    547551  applyGtkStyles(exportColors, 1);
    548552  applyGtkStyles(exportColors, 2);