diff options
| author | mread <qt-info@nokia.com> | 2009-08-10 13:18:56 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-10 13:18:56 (GMT) |
| commit | 34dd8163f4fcd16be5677fc94ce960cc464991d5 (patch) | |
| tree | f871fef42b4f337a98bce77ad307efe079b7dc5f /src/tools | |
| parent | 0dfca6e13a7ad3cce38d5509d446f76eb496f398 (diff) | |
| parent | 70e098d965318651acb725374b73e026f2946b76 (diff) | |
| download | Qt-34dd8163f4fcd16be5677fc94ce960cc464991d5.zip Qt-34dd8163f4fcd16be5677fc94ce960cc464991d5.tar.gz Qt-34dd8163f4fcd16be5677fc94ce960cc464991d5.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 2 | ||||
| -rw-r--r-- | src/tools/uic/uic.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index d8a1f96..396e9ae 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -89,7 +89,7 @@ win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp \ ../../corelib/io/qfsfileengine_iterator_win.cpp macx: { - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 #enables weak linking for 10.3 (exported) + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported) SOURCES += ../../corelib/kernel/qcore_mac.cpp LIBS += -framework CoreServices } diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index bbb3af7..14576e2 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -184,9 +184,9 @@ DomUI *Uic::parseUiFile(QXmlStreamReader &reader) if (reader.hasError()) { delete ui; ui = 0; - fprintf(stderr, "uic: Error in line %llu, column %llu : %s\n", - reader.lineNumber(), reader.columnNumber(), - reader.errorString().toAscii().constData()); + fprintf(stderr, "%s\n", qPrintable(QString::fromLatin1("uic: Error in line %1, column %2 : %3") + .arg(reader.lineNumber()).arg(reader.columnNumber()) + .arg(reader.errorString()))); } return ui; |