diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-10 02:47:19 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-10 02:47:19 (GMT) |
| commit | 5173a42be2d0121c0f33217cc4d8399070a8aa3b (patch) | |
| tree | 0f8b6cde906ae1d014e730506c2a58fbe2b6079c /mkspecs | |
| parent | 883da42f7c75775502c818aa456c8576d8457ff8 (diff) | |
| parent | 0d156972b868c951fa33f21735040ab1e7a76f21 (diff) | |
| download | Qt-5173a42be2d0121c0f33217cc4d8399070a8aa3b.zip Qt-5173a42be2d0121c0f33217cc4d8399070a8aa3b.tar.gz Qt-5173a42be2d0121c0f33217cc4d8399070a8aa3b.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
src/corelib/kernel/qmetaobject.cpp
tools/qdoc3/generator.cpp
tools/qdoc3/test/qt-cpp-ignore.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/uic.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index d2985f9..e768d0f 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -51,7 +51,7 @@ equals(UI_DIR, .) { uic3 { isEmpty(FORMS3) { UIC3_FORMS = FORMS - !build_pass:message("Project contains CONFIG+=uic3, but no files in FORMS3; .ui files in FORMS treated as UIC3 form files.") + !build_pass:message("Project contains CONFIG+=uic3, but no files in FORMS3; UI files in FORMS treated as UIC3 form files.") } else { UIC3_FORMS = FORMS3 } |