diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 01:27:27 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 01:27:39 +0100 |
| commit | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (patch) | |
| tree | 897cf6bfb1814b0935982ff5975a6cbfb48d6d9e /qmake/project.h | |
| parent | 3d19422ef16a230bb11dbbfe4a8cc9667f39bf15 (diff) | |
| parent | 6c612c933803ef57ea45e907d0181b40659148ac (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Change-Id: I89dc2e193bd01624c1fb50484610d516e39b1538
Diffstat (limited to 'qmake/project.h')
| -rw-r--r-- | qmake/project.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/project.h b/qmake/project.h index 6422ed1f32..979f1480bd 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -81,7 +81,7 @@ class QMakeProject bool recursive; bool own_prop; bool backslashWarned; - QString pfile, cfile; + QString pfile; QMakeProperty *prop; void reset(); QStringList extra_configs; |