Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/egl/egl.pri

    r561 r769  
    1 CONFIG += egl
     1contains(QT_CONFIG, egl): {
     2        CONFIG += egl
    23
    3 HEADERS += \
    4     egl/qegl_p.h \
    5     egl/qeglproperties_p.h
     4        HEADERS += \
     5            egl/qegl_p.h \
     6            egl/qeglproperties_p.h
    67
    7 SOURCES += \
    8     egl/qegl.cpp \
    9     egl/qeglproperties.cpp
     8        SOURCES += \
     9            egl/qegl.cpp \
     10            egl/qeglproperties.cpp
    1011
    11 wince*: SOURCES += egl/qegl_wince.cpp
     12        wince*: SOURCES += egl/qegl_wince.cpp
    1213
    13 unix {
    14     embedded {
    15         SOURCES += egl/qegl_qws.cpp
    16     } else {
    17         symbian {
    18             SOURCES += egl/qegl_symbian.cpp
    19         } else {
    20             SOURCES += egl/qegl_x11.cpp
    21         }
    22     }
     14        unix {
     15            embedded {
     16                SOURCES += egl/qegl_qws.cpp
     17            } else {
     18                symbian {
     19                    SOURCES += egl/qegl_symbian.cpp
     20                } else {
     21                    SOURCES += egl/qegl_x11.cpp
     22                }
     23            }
     24        }
     25} else:symbian {
     26        DEFINES += QT_NO_EGL
     27        SOURCES += egl/qegl_stub.cpp
     28        SOURCES += egl/qeglproperties_stub.cpp
    2329}
Note: See TracChangeset for help on using the changeset viewer.