Changeset 846 for trunk/src/winmain


Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/winmain/qtmain_win.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/winmain/winmain.pro

    r2 r846  
    99
    1010win32 {
    11         win32-g++:DEFINES += QT_NEEDS_QMAIN
     11        win32-g++*:DEFINES += QT_NEEDS_QMAIN
    1212        win32-borland:DEFINES += QT_NEEDS_QMAIN
    1313        SOURCES         = qtmain_win.cpp
    14         CONFIG          += png zlib
    15         CONFIG          -= jpeg
     14        CONFIG          += png
    1615        INCLUDEPATH     += tmp $$QMAKE_INCDIR_QT/QtCore
    1716}
Note: See TracChangeset for help on using the changeset viewer.