diff options
Diffstat (limited to 'tools/configure')
-rw-r--r-- | tools/configure/configureapp.h | 14 | ||||
-rw-r--r-- | tools/configure/environment.cpp | 18 | ||||
-rw-r--r-- | tools/configure/main.cpp | 12 | ||||
-rw-r--r-- | tools/configure/tools.cpp | 4 |
4 files changed, 24 insertions, 24 deletions
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index bf0f61639f..3e0e691dab 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -88,9 +88,9 @@ public: QString addDefine(QString def); enum ProjectType { - App, - Lib, - Subdirs + App, + Lib, + Subdirs }; ProjectType projectType( const QString& proFileName ); @@ -182,10 +182,10 @@ class MakeItem { public: MakeItem( const QString &d, const QString &p, const QString &t, Configure::ProjectType qt ) - : directory( d ), - proFile( p ), - target( t ), - qmakeTemplate( qt ) + : directory( d ), + proFile( p ), + target( t ), + qmakeTemplate( qt ) { } QString directory; diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 81769aa043..d0b0065d8a 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -467,8 +467,8 @@ bool Environment::cpdir(const QString &srcDir, const QString &destDir) qDebug() << "Attempt to cpdir " << cleanSrcName << "->" << cleanDstName; #endif if(!QFile::exists(cleanDstName) && !QDir().mkpath(cleanDstName)) { - qDebug() << "cpdir: Failure to create " << cleanDstName; - return false; + qDebug() << "cpdir: Failure to create " << cleanDstName; + return false; } bool result = true; @@ -476,23 +476,23 @@ bool Environment::cpdir(const QString &srcDir, const QString &destDir) QFileInfoList allEntries = dir.entryInfoList(QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot); for (int i = 0; result && (i < allEntries.count()); ++i) { QFileInfo entry = allEntries.at(i); - bool intermediate = true; + bool intermediate = true; if (entry.isDir()) { intermediate = cpdir(QString("%1/%2").arg(cleanSrcName).arg(entry.fileName()), QString("%1/%2").arg(cleanDstName).arg(entry.fileName())); } else { QString destFile = QString("%1/%2").arg(cleanDstName).arg(entry.fileName()); #ifdef CONFIGURE_DEBUG_CP_DIR - qDebug() << "About to cp (file)" << entry.absoluteFilePath() << "->" << destFile; + qDebug() << "About to cp (file)" << entry.absoluteFilePath() << "->" << destFile; #endif - QFile::remove(destFile); + QFile::remove(destFile); intermediate = QFile::copy(entry.absoluteFilePath(), destFile); SetFileAttributes((wchar_t*)destFile.utf16(), FILE_ATTRIBUTE_NORMAL); } - if(!intermediate) { - qDebug() << "cpdir: Failure for " << entry.fileName() << entry.isDir(); - result = false; - } + if (!intermediate) { + qDebug() << "cpdir: Failure for " << entry.fileName() << entry.isDir(); + result = false; + } } return result; } diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index 1e6aa3f298..ebbb4b1e54 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -59,7 +59,7 @@ int runConfigure( int argc, char** argv ) if (!app.isOk()) return 3; if( app.displayHelp() ) - return 1; + return 1; // Read license now, and exit if it doesn't pass. // This lets the user see the command-line options of configure @@ -103,19 +103,19 @@ int runConfigure( int argc, char** argv ) app.generateOutputVars(); if( !app.isDone() ) - app.generateCachefile(); + app.generateCachefile(); if( !app.isDone() ) - app.generateConfigfiles(); + app.generateConfigfiles(); if (!app.isDone()) app.generateQConfigPri(); if (!app.isDone()) app.displayConfig(); if( !app.isDone() ) - app.generateMakefiles(); + app.generateMakefiles(); if( !app.isDone() ) - app.showSummary(); + app.showSummary(); if( !app.isOk() ) - return 2; + return 2; return 0; } diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index ed0f3efb1b..e9174bf102 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -157,13 +157,13 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString case PL('X','C'): case PL('X','U'): case PL('X','W'): - case PL('X','M'): // old license key + case PL('X','M'): // old license key dictionary["LICENSE_EXTENSION"] = "-ALLOS"; break; case PL('6', 'M'): case PL('8', 'M'): - case PL('K', 'M'): // old license key + case PL('K', 'M'): // old license key case PL('N', '7'): case PL('N', '9'): case PL('N', 'X'): |