diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-07-14 06:55:05 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-07-14 06:55:05 (GMT) |
| commit | 0832d7209e3aee7055fb39339030ff6842f4117d (patch) | |
| tree | 75ec174a5492d0ddc52bc2f4dcdef363714a63cb /src/corelib/io/io.pri | |
| parent | ad0d0c4b6f7958b3cde01855b0f3b9c68db5253a (diff) | |
| parent | df28c1203e12c572f795b8d114254a8e5a6619e8 (diff) | |
| download | Qt-0832d7209e3aee7055fb39339030ff6842f4117d.zip Qt-0832d7209e3aee7055fb39339030ff6842f4117d.tar.gz Qt-0832d7209e3aee7055fb39339030ff6842f4117d.tar.bz2 | |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Conflicts:
src/gui/image/image.pri
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
Diffstat (limited to 'src/corelib/io/io.pri')
| -rw-r--r-- | src/corelib/io/io.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index 7c14886..cfb40bc 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -95,6 +95,6 @@ win32 { SOURCES += io/qfilesystemwatcher_symbian.cpp HEADERS += io/qfilesystemwatcher_symbian_p.h INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE - contains(QT_CONFIG, s60): LIBS += -lplatformenv + LIBS += -lplatformenv } } |