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/linguist/lrelease/lrelease.pro

    r385 r561  
    33DESTDIR         = ../../../bin
    44
    5 QT              -= gui
    6 
    7 CONFIG          += qt warn_on console
    8 CONFIG          -= app_bundle
    9 
    10 build_all:!build_pass {
    11     CONFIG -= build_all
    12     CONFIG += release
    13 }
    14 
    155DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
    166SOURCES += main.cpp
    177
    18 include(../../../src/qt_professional.pri)
     8INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global # qlibraryinfo.cpp includes qconfig.cpp
     9SOURCES += \
     10    $$QT_SOURCE_TREE/src/corelib/global/qlibraryinfo.cpp \
     11    $$QT_SOURCE_TREE/src/corelib/io/qsettings.cpp
     12win32:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_win.cpp
     13macx:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_mac.cpp
     14
     15include(../../../src/tools/bootstrap/bootstrap.pri)
    1916include(../shared/formats.pri)
    2017include(../shared/proparser.pri)
    21 include(../shared/translatortools.pri)
     18
     19win32:LIBS += -ladvapi32   # for qsettings_win.cpp
    2220
    2321target.path=$$[QT_INSTALL_BINS]
Note: See TracChangeset for help on using the changeset viewer.