diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 | ||||
| -rw-r--r-- | tools/linguist/lupdate/main.cpp | 6 | ||||
| -rw-r--r-- | tools/linguist/tests/tst_lupdate.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index b9868e6..31c359e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2760,7 +2760,7 @@ void Configure::generateOutputVars() QFile::remove(dst); if (dictionary["WEBKIT"] != "no") { // This include takes care of adding "webkit" to QT_CONFIG. - QString src = sourcePath + "/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri"; + QString src = sourcePath + "/src/3rdparty/webkit/Source/WebKit/qt/qt_webkit_version.pri"; QFile::copy(src, dst); if (dictionary["WEBKIT"] == "debug") qtConfig += "webkit-debug"; diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index 34bb792..ab88083 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -62,12 +62,14 @@ static QString m_defaultExtensions; static void printOut(const QString & out) { - std::cout << qPrintable(out); + QTextStream stream(stdout); + stream << out; } static void printErr(const QString & out) { - std::cerr << qPrintable(out); + QTextStream stream(stderr); + stream << out; } class LU { diff --git a/tools/linguist/tests/tst_lupdate.cpp b/tools/linguist/tests/tst_lupdate.cpp index eb6e865..21d83ef 100644 --- a/tools/linguist/tests/tst_lupdate.cpp +++ b/tools/linguist/tests/tst_lupdate.cpp @@ -118,7 +118,7 @@ void tst_linguist::fetchtr() //qDebug() << "resname:" << resname; ////qDebug() << "resfile:" << resfile; //qDebug() << "resline:" << resline; - //qDebug() << "ressource:" << ressrc; + //qDebug() << "resource:" << ressrc; QCOMPARE(src + ": " + resname, src + ": " + name); QCOMPARE(src + ": " + resline, src + ": " + line); |