diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-07-06 05:46:31 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-07-06 05:46:31 (GMT) |
| commit | 49dccb31d1e31c4d538f65c62e20268fc2496a6e (patch) | |
| tree | a6c930fc8e0056a505475ab24be5233ee8ca859a /src/winmain/winmain.pro | |
| parent | c9d487b6ed3ac9bb666c2a1fe08252f3c6dcb455 (diff) | |
| parent | 7369eaf32dd45b6fb4e72c34bee2c9a44c62a5b4 (diff) | |
| download | Qt-49dccb31d1e31c4d538f65c62e20268fc2496a6e.zip Qt-49dccb31d1e31c4d538f65c62e20268fc2496a6e.tar.gz Qt-49dccb31d1e31c4d538f65c62e20268fc2496a6e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
doc/src/declarative/extending.qdoc
Diffstat (limited to 'src/winmain/winmain.pro')
| -rw-r--r-- | src/winmain/winmain.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index 0c9b214..8c2710c 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -12,7 +12,6 @@ win32 { win32-borland:DEFINES += QT_NEEDS_QMAIN SOURCES = qtmain_win.cpp CONFIG += png - CONFIG -= jpeg INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore } |