diff options
Diffstat (limited to 'meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch b/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch new file mode 100644 index 0000000000..1d250d8a98 --- /dev/null +++ b/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch | |||
| @@ -0,0 +1,86 @@ | |||
| 1 | qt-embedded: fix linker error in do_compile | ||
| 2 | |||
| 3 | This patch ensures that we link to libQtCLucene where required (i.e. when | ||
| 4 | linking to libQtHelp) avoiding a linker error. | ||
| 5 | |||
| 6 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
| 7 | |||
| 8 | Index: qt-everywhere-opensource-src-4.6.3/demos/qtdemo/qtdemo.pro | ||
| 9 | =================================================================== | ||
| 10 | --- qt-everywhere-opensource-src-4.6.3.orig/demos/qtdemo/qtdemo.pro 2011-01-11 16:06:47.382828004 +0000 | ||
| 11 | +++ qt-everywhere-opensource-src-4.6.3/demos/qtdemo/qtdemo.pro 2011-01-11 16:10:06.906828001 +0000 | ||
| 12 | @@ -76,3 +76,10 @@ | ||
| 13 | sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES qtdemo.pro images xml *.ico *.icns *.rc *.plist | ||
| 14 | sources.path = $$[QT_INSTALL_DEMOS]/qtdemo | ||
| 15 | |||
| 16 | +qclucene = QtCLucene$${QT_LIBINFIX} | ||
| 17 | +if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { | ||
| 18 | + mac:qclucene = $${qclucene}_debug | ||
| 19 | + win32:qclucene = $${qclucene}d | ||
| 20 | +} | ||
| 21 | +linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene | ||
| 22 | +LIBS_PRIVATE += -l$$qclucene | ||
| 23 | Index: qt-everywhere-opensource-src-4.6.3/examples/help/contextsensitivehelp/contextsensitivehelp.pro | ||
| 24 | =================================================================== | ||
| 25 | --- qt-everywhere-opensource-src-4.6.3.orig/examples/help/contextsensitivehelp/contextsensitivehelp.pro 2011-01-11 16:05:56.598828002 +0000 | ||
| 26 | +++ qt-everywhere-opensource-src-4.6.3/examples/help/contextsensitivehelp/contextsensitivehelp.pro 2011-01-11 16:09:57.762828002 +0000 | ||
| 27 | @@ -18,3 +18,11 @@ | ||
| 28 | INSTALLS += target sources | ||
| 29 | |||
| 30 | symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) | ||
| 31 | + | ||
| 32 | +qclucene = QtCLucene$${QT_LIBINFIX} | ||
| 33 | +if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { | ||
| 34 | + mac:qclucene = $${qclucene}_debug | ||
| 35 | + win32:qclucene = $${qclucene}d | ||
| 36 | +} | ||
| 37 | +linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene | ||
| 38 | +LIBS_PRIVATE += -l$$qclucene | ||
| 39 | Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/assistant/assistant.pro | ||
| 40 | =================================================================== | ||
| 41 | --- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/assistant/assistant.pro 2011-01-11 14:56:50.902828001 +0000 | ||
| 42 | +++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/assistant/assistant.pro 2011-01-11 16:09:39.914828003 +0000 | ||
| 43 | @@ -85,3 +85,11 @@ | ||
| 44 | DEFINES += USE_STATIC_SQLITE_PLUGIN | ||
| 45 | } | ||
| 46 | } | ||
| 47 | + | ||
| 48 | +qclucene = QtCLucene$${QT_LIBINFIX} | ||
| 49 | +if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { | ||
| 50 | + mac:qclucene = $${qclucene}_debug | ||
| 51 | + win32:qclucene = $${qclucene}d | ||
| 52 | +} | ||
| 53 | +linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene | ||
| 54 | +LIBS_PRIVATE += -l$$qclucene | ||
| 55 | Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro | ||
| 56 | =================================================================== | ||
| 57 | --- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-11 14:56:50.918828002 +0000 | ||
| 58 | +++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-11 16:09:44.538828001 +0000 | ||
| 59 | @@ -12,3 +12,11 @@ | ||
| 60 | main.cpp | ||
| 61 | |||
| 62 | HEADERS += ../shared/helpgenerator.h | ||
| 63 | + | ||
| 64 | +qclucene = QtCLucene$${QT_LIBINFIX} | ||
| 65 | +if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { | ||
| 66 | + mac:qclucene = $${qclucene}_debug | ||
| 67 | + win32:qclucene = $${qclucene}d | ||
| 68 | +} | ||
| 69 | +linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene | ||
| 70 | +LIBS_PRIVATE += -l$$qclucene | ||
| 71 | Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro | ||
| 72 | =================================================================== | ||
| 73 | --- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-11 14:56:50.930828002 +0000 | ||
| 74 | +++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-11 16:09:50.274828003 +0000 | ||
| 75 | @@ -12,3 +12,11 @@ | ||
| 76 | main.cpp | ||
| 77 | |||
| 78 | HEADERS += ../shared/helpgenerator.h | ||
| 79 | + | ||
| 80 | +qclucene = QtCLucene$${QT_LIBINFIX} | ||
| 81 | +if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { | ||
| 82 | + mac:qclucene = $${qclucene}_debug | ||
| 83 | + win32:qclucene = $${qclucene}d | ||
| 84 | +} | ||
| 85 | +linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene | ||
| 86 | +LIBS_PRIVATE += -l$$qclucene | ||