touchup libexecdir
This commit is contained in:
parent
67be42f91d
commit
cc50bd0f86
|
@ -1,7 +1,7 @@
|
||||||
diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp
|
diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp
|
||||||
--- kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir 2008-07-03 00:06:28.000000000 -0500
|
--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir 2009-05-06 05:14:38.000000000 -0500
|
||||||
+++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp 2008-07-06 14:38:18.000000000 -0500
|
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp 2009-05-14 11:34:04.732889142 -0500
|
||||||
@@ -1625,7 +1625,7 @@ void KStandardDirs::addKDEDefaults()
|
@@ -1759,7 +1759,7 @@ void KStandardDirs::addKDEDefaults()
|
||||||
addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
|
addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
|
||||||
index+=2;
|
index+=2;
|
||||||
}
|
}
|
||||||
|
@ -9,10 +9,10 @@ diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.0.
|
||||||
+ addResourceType("exe", 0, "libexec/kde4", true );
|
+ addResourceType("exe", 0, "libexec/kde4", true );
|
||||||
|
|
||||||
addResourceDir("home", QDir::homePath(), false);
|
addResourceDir("home", QDir::homePath(), false);
|
||||||
}
|
|
||||||
diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp
|
diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp
|
||||||
--- kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2008-05-21 06:08:57.000000000 -0500
|
--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2008-05-21 06:08:57.000000000 -0500
|
||||||
+++ kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp 2008-07-06 14:38:18.000000000 -0500
|
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp 2009-05-14 11:30:40.737623244 -0500
|
||||||
@@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const
|
@@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const
|
||||||
if (strcmp("lib", type) == 0)
|
if (strcmp("lib", type) == 0)
|
||||||
return QString::fromLatin1(LIB_INSTALL_DIR "/");
|
return QString::fromLatin1(LIB_INSTALL_DIR "/");
|
||||||
|
@ -22,10 +22,10 @@ diff -up kdelibs-4.0.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs
|
||||||
if (strcmp("locale", type) == 0)
|
if (strcmp("locale", type) == 0)
|
||||||
return QString::fromLatin1(LOCALE_INSTALL_DIR "/");
|
return QString::fromLatin1(LOCALE_INSTALL_DIR "/");
|
||||||
break;
|
break;
|
||||||
diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp
|
diff -up kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp
|
||||||
--- kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir 2008-07-03 00:06:29.000000000 -0500
|
--- kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir 2009-02-27 06:31:32.000000000 -0600
|
||||||
+++ kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp 2008-07-06 14:41:31.000000000 -0500
|
+++ kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp 2009-05-14 11:30:40.737623244 -0500
|
||||||
@@ -73,8 +73,9 @@ void KStandarddirsTest::testFindResource
|
@@ -74,8 +74,9 @@ void KStandarddirsTest::testFindResource
|
||||||
#define KIOSLAVE "bin/kioslave.exe"
|
#define KIOSLAVE "bin/kioslave.exe"
|
||||||
#else
|
#else
|
||||||
#define EXT ""
|
#define EXT ""
|
||||||
|
@ -36,7 +36,7 @@ diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4
|
||||||
const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
|
const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
|
||||||
QVERIFY( !bin.isEmpty() );
|
QVERIFY( !bin.isEmpty() );
|
||||||
QVERIFY( bin.endsWith( KIOSLAVE ) );
|
QVERIFY( bin.endsWith( KIOSLAVE ) );
|
||||||
@@ -173,7 +174,7 @@ void KStandarddirsTest::testFindExe()
|
@@ -174,7 +175,7 @@ void KStandarddirsTest::testFindExe()
|
||||||
// findExe with a result in libexec
|
// findExe with a result in libexec
|
||||||
const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
|
const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
|
||||||
QVERIFY( !lnusertemp.isEmpty() );
|
QVERIFY( !lnusertemp.isEmpty() );
|
||||||
|
@ -45,9 +45,9 @@ diff -up kdelibs-4.0.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Check the "exe" resource too
|
// Check the "exe" resource too
|
||||||
diff -up kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.0.85/kio/tests/krununittest.cpp
|
diff -up kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.2.85/kio/tests/krununittest.cpp
|
||||||
--- kdelibs-4.0.85/kio/tests/krununittest.cpp.libexecdir 2008-05-21 06:08:08.000000000 -0500
|
--- kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir 2008-05-21 06:08:08.000000000 -0500
|
||||||
+++ kdelibs-4.0.85/kio/tests/krununittest.cpp 2008-07-06 14:38:18.000000000 -0500
|
+++ kdelibs-4.2.85/kio/tests/krununittest.cpp 2009-05-14 11:30:40.737623244 -0500
|
||||||
@@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe
|
@@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe
|
||||||
if (kmailservice.isEmpty()) kmailservice = "kmailservice";
|
if (kmailservice.isEmpty()) kmailservice = "kmailservice";
|
||||||
if (!kdeinit.isEmpty()) {
|
if (!kdeinit.isEmpty()) {
|
||||||
|
|
Loading…
Reference in New Issue