diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:59:01 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:59:01 (GMT) |
| commit | f1aeeb025c5042f6684855006f963e2203d9c153 (patch) | |
| tree | 430cbdfa0c42e23289f7cd4b5907656810dbe895 /tools/assistant/lib/lib.pro | |
| parent | 168524d4f642724fe9063500c0c39ab747f145b6 (diff) | |
| parent | 88412920c58286d22aaa1e121b1030298adf86eb (diff) | |
| download | Qt-f1aeeb025c5042f6684855006f963e2203d9c153.zip Qt-f1aeeb025c5042f6684855006f963e2203d9c153.tar.gz Qt-f1aeeb025c5042f6684855006f963e2203d9c153.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
Diffstat (limited to 'tools/assistant/lib/lib.pro')
| -rw-r--r-- | tools/assistant/lib/lib.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro index 51933de..26d3456 100644 --- a/tools/assistant/lib/lib.pro +++ b/tools/assistant/lib/lib.pro @@ -23,7 +23,6 @@ unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \ QtSql \ QtXml LIBS_PRIVATE += -l$$qclucene - RESOURCES += helpsystem.qrc SOURCES += qhelpenginecore.cpp \ qhelpengine.cpp \ @@ -41,6 +40,7 @@ SOURCES += qhelpenginecore.cpp \ qhelpsearchindexwriter_default.cpp \ qhelpsearchindexreader_default.cpp \ qhelpsearchindexreader.cpp \ + qclucenefieldnames.cpp \ qhelp_global.cpp # access to clucene @@ -63,7 +63,8 @@ HEADERS += qhelpenginecore.h \ qhelpsearchindex_default_p.h \ qhelpsearchindexwriter_default_p.h \ qhelpsearchindexreader_default_p.h \ - qhelpsearchindexreader_p.h + qhelpsearchindexreader_p.h \ + qclucenefieldnames_p.h # access to clucene HEADERS += qhelpsearchindexwriter_clucene_p.h \ |