[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kinit
From:       Harald Fernengel <harry () kdevelop ! org>
Date:       2009-02-02 18:04:20
Message-ID: 1233597860.129595.22077.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 920319 by harald:

compile on OS X


 M  +2 -2      kinit.cpp  
 M  +2 -0      klauncher.cpp  


--- trunk/KDE/kdelibs/kinit/kinit.cpp #920318:920319
@@ -637,9 +637,9 @@
 
         setup_tty( tty );
 
-        QByteArray executable = execpath.data();
+        QByteArray executable = execpath;
 #ifdef Q_WS_MAC
-        QString bundlepath = s_instance->dirs()->findExe( execpath.data() );
+        QString bundlepath = s_instance->dirs()->findExe(QFile::decodeName(executable));
         if (!bundlepath.isEmpty())
            executable = QFile::encodeName(bundlepath);
 #endif
--- trunk/KDE/kdelibs/kinit/klauncher.cpp #920318:920319
@@ -972,6 +972,7 @@
 #endif
    request->envs = envs;
    request->cwd = workdir;
+#ifdef Q_WS_X11
    if (!app.endsWith(QLatin1String("kbuildsycoca4"))) { // avoid stupid loop
        // Find service, if any - strip path if needed
        const QString desktopName = app.mid(app.lastIndexOf(QLatin1Char('/')) + 1);
@@ -984,6 +985,7 @@
            cancel_service_startup_info(request, request->startup_id, envs);
 #endif
    }
+#endif
    msg.setDelayedReply(true);
    request->transaction = msg;
    queueRequest(request);
[prev in list] [next in list] [prev in thread] [next in thread]