Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/tools/assistant/lib/lib.pro

    r552 r561  
    1 QT += sql xml network
     1QT += sql \
     2    xml \
     3    network
    24TEMPLATE = lib
    35TARGET = QtHelp
    4 DEFINES += QHELP_LIB QT_CLUCENE_SUPPORT
    5 CONFIG += qt warn_on
    6 
     6DEFINES += QHELP_LIB \
     7    QT_CLUCENE_SUPPORT
     8CONFIG += qt \
     9    warn_on
    710include(../../../src/qbase.pri)
    8 
    911QMAKE_TARGET_PRODUCT = Help
    10 QMAKE_TARGET_DESCRIPTION = Help application framework.
     12QMAKE_TARGET_DESCRIPTION = Help \
     13    application \
     14    framework.
    1115DEFINES -= QT_ASCII_CAST_WARNINGS
    12 
    1316qclucene = QtCLucene$${QT_LIBINFIX}
    14 if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
     17if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { 
    1518    mac:qclucene = $${qclucene}_debug
    1619    win32|os2:qclucene = $${qclucene}d
    1720}
    18 linux-lsb-g++:LIBS += --lsb-shared-libs=$$qclucene
    19 unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork QtSql QtXml
    20 LIBS += -l$$qclucene
    21 unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork QtSql QtXml
     21linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
     22unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \
     23    QtSql \
     24    QtXml
     25LIBS_PRIVATE += -l$$qclucene
    2226
    2327RESOURCES += helpsystem.qrc
    24 
    2528SOURCES += qhelpenginecore.cpp \
    26            qhelpengine.cpp \
    27            qhelpdbreader.cpp \
    28            qhelpcontentwidget.cpp \
    29            qhelpindexwidget.cpp \
    30            qhelpgenerator.cpp \
    31            qhelpdatainterface.cpp \
    32            qhelpprojectdata.cpp \
    33            qhelpcollectionhandler.cpp \
    34            qhelpsearchengine.cpp \
    35            qhelpsearchquerywidget.cpp \
    36            qhelpsearchresultwidget.cpp \
    37            qhelpsearchindex_default.cpp \
    38            qhelpsearchindexwriter_default.cpp \
    39            qhelpsearchindexreader_default.cpp
     29    qhelpengine.cpp \
     30    qhelpdbreader.cpp \
     31    qhelpcontentwidget.cpp \
     32    qhelpindexwidget.cpp \
     33    qhelpgenerator.cpp \
     34    qhelpdatainterface.cpp \
     35    qhelpprojectdata.cpp \
     36    qhelpcollectionhandler.cpp \
     37    qhelpsearchengine.cpp \
     38    qhelpsearchquerywidget.cpp \
     39    qhelpsearchresultwidget.cpp \
     40    qhelpsearchindex_default.cpp \
     41    qhelpsearchindexwriter_default.cpp \
     42    qhelpsearchindexreader_default.cpp \
     43    qhelpsearchindexreader.cpp \
     44    qhelp_global.cpp
    4045
    4146# access to clucene
    4247SOURCES += qhelpsearchindexwriter_clucene.cpp \
    43            qhelpsearchindexreader_clucene.cpp
    44 
     48    qhelpsearchindexreader_clucene.cpp
    4549HEADERS += qhelpenginecore.h \
    46            qhelpengine.h \
    47            qhelpengine_p.h \
    48            qhelp_global.h \
    49            qhelpdbreader_p.h \
    50            qhelpcontentwidget.h \
    51            qhelpindexwidget.h \
    52            qhelpgenerator_p.h \
    53            qhelpdatainterface_p.h \
    54            qhelpprojectdata_p.h \
    55            qhelpcollectionhandler_p.h \
    56            qhelpsearchengine.h \
    57            qhelpsearchquerywidget.h \
    58            qhelpsearchresultwidget.h \
    59            qhelpsearchindex_default_p.h \
    60            qhelpsearchindexwriter_default_p.h \
    61            qhelpsearchindexreader_default_p.h
     50    qhelpengine.h \
     51    qhelpengine_p.h \
     52    qhelp_global.h \
     53    qhelpdbreader_p.h \
     54    qhelpcontentwidget.h \
     55    qhelpindexwidget.h \
     56    qhelpgenerator_p.h \
     57    qhelpdatainterface_p.h \
     58    qhelpprojectdata_p.h \
     59    qhelpcollectionhandler_p.h \
     60    qhelpsearchengine.h \
     61    qhelpsearchquerywidget.h \
     62    qhelpsearchresultwidget.h \
     63    qhelpsearchindex_default_p.h \
     64    qhelpsearchindexwriter_default_p.h \
     65    qhelpsearchindexreader_default_p.h \
     66    qhelpsearchindexreader_p.h
    6267
    6368# access to clucene
    6469HEADERS += qhelpsearchindexwriter_clucene_p.h \
    65            qhelpsearchindexreader_clucene_p.h
     70    qhelpsearchindexreader_clucene_p.h
Note: See TracChangeset for help on using the changeset viewer.