Merge branch 'custom-defines'
author Julien Desgats
()
committer Julien Desgats
()
commit 254f25fd569fd0bcfb509531bf5ddf6a716a761a
tree 8ea9f072f4114f6e9dbf152029c300c0bf899711
parent f1d34548ae817b4ee65273c45f99af96dc0f33b8
parent fd2919466cad1a1bb891b271f7ab63a2b1ff376f
Merge branch 'custom-defines'
qmakemanager.cpp
qmakemanager.h
qmakeprojectfile.cpp
qmakeprojectfile.h
tests/test_qmakefile.cpp
tests/test_qmakefile.h