feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

HTML5 wizard: Compile on Linux/warnings.

Browse Source
This commit is contained in:
Friedemann Kleint
2011-04-18 08:55:00 +02:00
parent 8363883834
commit 204de4048c
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qt4projectmanager/wizards/html5app.cpp
View File

@@ -192,7 +192,7 @@ QByteArray Html5App::appViewerCppFileCode(QString *errorMessage) const
static const QString touchNavigavigationDir = static const QString touchNavigavigationDir =
originsRoot() + appViewerOriginsSubDir + QLatin1String("touchnavigation/"); originsRoot() + appViewerOriginsSubDir + QLatin1String("touchnavigation/");
QByteArray touchNavigavigationCode; QByteArray touchNavigavigationCode;
for (int i = 0; i < sizeof(touchNavigavigationFiles) / sizeof(touchNavigavigationFiles[0]); ++i) { for (size_t i = 0; i < sizeof(touchNavigavigationFiles) / sizeof(touchNavigavigationFiles[0]); ++i) {
QFile touchNavigavigationFile(touchNavigavigationDir + QLatin1String(touchNavigavigationFiles[i])); QFile touchNavigavigationFile(touchNavigavigationDir + QLatin1String(touchNavigavigationFiles[i]));
if (!touchNavigavigationFile.open(QIODevice::ReadOnly)) { if (!touchNavigavigationFile.open(QIODevice::ReadOnly)) {
if (errorMessage) if (errorMessage)
@@ -204,12 +204,13 @@ QByteArray Html5App::appViewerCppFileCode(QString *errorMessage) const
QString line; QString line;
while (!(line = touchNavigavigationFileIn.readLine()).isNull()) { while (!(line = touchNavigavigationFileIn.readLine()).isNull()) {
if (line.startsWith(QLatin1String("#include")) || if (line.startsWith(QLatin1String("#include")) ||
(line.startsWith(QLatin1String("#ifndef")) ((line.startsWith(QLatin1String("#ifndef"))
|| line.startsWith(QLatin1String("#define")) || line.startsWith(QLatin1String("#define"))
|| line.startsWith(QLatin1String("#endif"))) || line.startsWith(QLatin1String("#endif")))
&& line.endsWith(QLatin1String("_H"))) && line.endsWith(QLatin1String("_H"))))
continue; continue;
touchNavigavigationCode.append(line + QLatin1Char('\n')); touchNavigavigationCode.append(line.toLatin1());
touchNavigavigationCode.append('\n');
} }
} }
@@ -226,17 +227,21 @@ QByteArray Html5App::appViewerCppFileCode(QString *errorMessage) const
QString line; QString line;
while (!(line = in.readLine()).isNull()) { while (!(line = in.readLine()).isNull()) {
if (!touchNavigavigationCodeInserted && line == QLatin1String("#ifdef TOUCH_OPTIMIZED_NAVIGATION")) { if (!touchNavigavigationCodeInserted && line == QLatin1String("#ifdef TOUCH_OPTIMIZED_NAVIGATION")) {
appViewerCppCode.append(line + QLatin1Char('\n')); appViewerCppCode.append(line.toLatin1());
appViewerCppCode.append('\n');
while (!(line = in.readLine()).isNull() while (!(line = in.readLine()).isNull()
&& !line.contains(QLatin1String("#endif // TOUCH_OPTIMIZED_NAVIGATION"))) && !line.contains(QLatin1String("#endif // TOUCH_OPTIMIZED_NAVIGATION")))
{ {
if (!line.startsWith(QLatin1String("#include \""))) if (!line.startsWith(QLatin1String("#include \""))) {
appViewerCppCode.append(line + QLatin1Char('\n')); appViewerCppCode.append(line.toLatin1());
appViewerCppCode.append('\n');
}
} }
appViewerCppCode.append(touchNavigavigationCode); appViewerCppCode.append(touchNavigavigationCode);
touchNavigavigationCodeInserted = true; touchNavigavigationCodeInserted = true;
} }
appViewerCppCode.append(line + QLatin1Char('\n')); appViewerCppCode.append(line.toLatin1());
appViewerCppCode.append('\n');
} }
return appViewerCppCode; return appViewerCppCode;
} }