diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-06-18 13:10:26 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-06-18 13:10:26 +0200 |
| commit | a3fd00796dafe52d4ff138b271564daf70d1adee (patch) | |
| tree | 77ca481c06c1b2c3c7822a4cd5864702e341b680 /qmake/project.h | |
| parent | 793d1ed8d3a03eefdd487facdacf66ba575e1a07 (diff) | |
| parent | 6aa50af000f85cc4497749fcf0860c8ed244a60e (diff) | |
| download | qt4-tools-a3fd00796dafe52d4ff138b271564daf70d1adee.tar.gz | |
Merge remote branch 'qt/4.7' into lighthouse
Conflicts:
configure
mkspecs/common/qws.conf
src/corelib/io/qresource.cpp
src/gui/image/qpixmapdata_p.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/opengl/qgl_p.h
src/plugins/mediaservices/gstreamer/gstreamer.pro
Diffstat (limited to 'qmake/project.h')
| -rw-r--r-- | qmake/project.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/project.h b/qmake/project.h index 0c542db10a..fd8ced1f37 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -80,6 +80,7 @@ class QMakeProject bool recursive; bool own_prop; + bool backslashWarned; QString pfile, cfile; QMakeProperty *prop; void reset(); |