From ac401cf3ff836dcd0aa5f266c2f2bb26e9f400a4 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 5 Jan 2011 07:56:41 +0100 Subject: [PATCH] Adapt QtCLucene to modularization rules --- modules/qt_clucene.pri | 11 +++++++++++ src/assistant/lib/fulltextsearch/fulltextsearch.pro | 3 ++- sync.profile | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 modules/qt_clucene.pri diff --git a/modules/qt_clucene.pri b/modules/qt_clucene.pri new file mode 100644 index 0000000..dc709bc --- /dev/null +++ b/modules/qt_clucene.pri @@ -0,0 +1,11 @@ +QT_CLUCENE_VERSION = $$QT_VERSION +QT_CLUCENE_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_CLUCENE_MINOR_VERSION = $$QT_MINOR_VERSION +QT_CLUCENE_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.clucene.name = QtCLucene +QT.clucene.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtCLucene +QT.clucene.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCLucene/private +QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/lib/fulltextsearch +QT.clucene.libs = $$QT_MODULE_LIB_BASE +QT.clucene.depends = core diff --git a/src/assistant/lib/fulltextsearch/fulltextsearch.pro b/src/assistant/lib/fulltextsearch/fulltextsearch.pro index d0e7a87..de68111 100644 --- a/src/assistant/lib/fulltextsearch/fulltextsearch.pro +++ b/src/assistant/lib/fulltextsearch/fulltextsearch.pro @@ -1,3 +1,4 @@ +load(qt_module) QMAKE_TARGET_PRODUCT = QtCLucene QMAKE_TARGET_DESCRIPTION = QtCLucene full text search library wrapper. @@ -13,7 +14,7 @@ QT -= gui TEMPLATE = lib TARGET = QtCLucene DEFINES += QHELP_LIB -include(../../../../src/qbase.pri) +include($$QT_SOURCE_TREE/src/qbase.pri) include(fulltextsearch.pri) CONFIG += qt warn_off diff --git a/sync.profile b/sync.profile index 443b891..0e4a6c3 100644 --- a/sync.profile +++ b/sync.profile @@ -1,4 +1,5 @@ %modules = ( # path to module name map + "QtCLucene" => "$basedir/src/assistant/lib/fulltextsearch", "QtHelp" => "$basedir/src/assistant/lib", "QtDesigner" => "$basedir/src/designer/src/lib", "QtUiTools" => "$basedir/src/designer/src/uitools", @@ -14,11 +15,13 @@ "script" => "#include \n", "qt3support" => "#include \n", "declarative" => "#include \n", + "clucene" => "#include \n", "help" => "#include \n", "designer" => "#include \n", "uitools" => "#include \n", ); %modulepris = ( + "QtCLucene" => "$basedir/modules/qt_clucene.pri", "QtHelp" => "$basedir/modules/qt_help.pri", "QtDesigner" => "$basedir/modules/qt_designer.pri", "QtUiTools" => "$basedir/modules/qt_uitools.pri", -- 2.7.4