50 lines
2.9 KiB
Diff
50 lines
2.9 KiB
Diff
--- qtbinpatcher-2.1.4/QtBinPatcher.cpp.orig 2015-04-28 13:25:04.642600000 +0300
|
|
+++ qtbinpatcher-2.1.4/QtBinPatcher.cpp 2015-04-28 13:32:03.050200000 +0300
|
|
@@ -255,32 +255,34 @@
|
|
// Files for patching in Qt4.
|
|
static const TElement Elements4[] = {
|
|
{ "/lib/", "*.prl", false },
|
|
- { "/demos/shared/", "libdemo_shared.prl", false },
|
|
+ { "/share/qt4/demos/shared/", "libdemo_shared.prl", false },
|
|
{ "/lib/pkgconfig/", "Qt*.pc", false },
|
|
{ "/lib/pkgconfig/", "phonon*.pc", false },
|
|
#if defined(OS_WINDOWS)
|
|
- { "/mkspecs/default/", "qmake.conf", false },
|
|
+ { "/share/qt4/mkspecs/default/", "qmake.conf", false },
|
|
{ "/", ".qmake.cache", false }
|
|
#elif defined(OS_LINUX)
|
|
{ "/lib/pkgconfig/", "qt*.pc", false },
|
|
{ "/lib/", "*.la", false },
|
|
{ "/mkspecs/", "qconfig.pri", false }
|
|
#endif
|
|
};
|
|
|
|
// Files for patching in Qt5.
|
|
static const TElement Elements5[] = {
|
|
- { "/", "*.la", true },
|
|
- { "/", "*.prl", true },
|
|
- { "/lib/pkgconfig/", "Qt5*.pc", true },
|
|
- { "/lib/pkgconfig/", "Enginio*.pc", true },
|
|
- { "/", "*.pri", true },
|
|
- { "/lib/cmake/Qt5LinguistTools/", "Qt5LinguistToolsConfig.cmake", false },
|
|
- { "/mkspecs/default-host/", "qmake.conf", false },
|
|
+#if !defined(OS_WINDOWS)
|
|
+ { "/", "*.la", true },
|
|
+#endif
|
|
+ { "/lib/", "*.prl", true },
|
|
+ { "/lib/pkgconfig/", "Qt5*.pc", true },
|
|
+ { "/lib/pkgconfig/", "Enginio*.pc", true },
|
|
+ { "/share/qt5/", "*.pri", true },
|
|
+ { "/lib/cmake/Qt5LinguistTools/", "Qt5LinguistToolsConfig.cmake", false },
|
|
+ { "/share/qt5/mkspecs/default-host/", "qmake.conf", false },
|
|
#ifdef OS_WINDOWS
|
|
- { "/mkspecs/default/", "qmake.conf", false },
|
|
- { "/", ".qmake.cache", false },
|
|
- { "/lib/", "prl.txt", false }
|
|
+ { "/share/qt5/mkspecs/default/", "qmake.conf", false },
|
|
+ { "/", ".qmake.cache", false },
|
|
+ { "/lib/", "prl.txt", false }
|
|
#endif
|
|
};
|
|
|