diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-07-21 10:51:14 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-07-21 10:51:14 (GMT) |
| commit | c5eff466432988b338d9d0f340e9d31955109eea (patch) | |
| tree | ff5d02ba770242f0c5e465d5a811be7e619afef2 /src | |
| parent | 99ddd27d400c92949d730ebf4f31eb2fea857650 (diff) | |
| download | Qt-c5eff466432988b338d9d0f340e9d31955109eea.zip Qt-c5eff466432988b338d9d0f340e9d31955109eea.tar.gz Qt-c5eff466432988b338d9d0f340e9d31955109eea.tar.bz2 | |
Compile with QT_NO_PROCESS or QT_NO_SETTINGS
Feature define logic was wrong
Reviewed-by: Robert Griebl
Diffstat (limited to 'src')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 70c8c8d..5de37dc 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -937,7 +937,7 @@ static void qParseArgs(int argc, char *argv[]) " -iterations n : Sets the number of accumulation iterations.\n" " -median n : Sets the number of median iterations.\n" " -vb : Print out verbose benchmarking information.\n" -#if !defined(QT_NO_PROCESS) || !defined(QT_NO_SETTINGS) +#if !defined(QT_NO_PROCESS) && !defined(QT_NO_SETTINGS) " -chart : Create chart based on the benchmark result.\n" #endif "\n" @@ -1053,7 +1053,7 @@ static void qParseArgs(int argc, char *argv[]) } else if (strcmp(argv[i], "-vb") == 0) { QBenchmarkGlobalData::current->verboseOutput = true; -#if !defined(QT_NO_PROCESS) || !defined(QT_NO_SETTINGS) +#if !defined(QT_NO_PROCESS) && !defined(QT_NO_SETTINGS) } else if (strcmp(argv[i], "-chart") == 0) { QBenchmarkGlobalData::current->createChart = true; QTestLog::setLogMode(QTestLog::XML); @@ -1627,7 +1627,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv) #endif -#if !defined(QT_NO_PROCESS) || !defined(QT_NO_SETTINGS) +#if !defined(QT_NO_PROCESS) && !defined(QT_NO_SETTINGS) if (QBenchmarkGlobalData::current->createChart) { QString chartLocation = QLibraryInfo::location(QLibraryInfo::BinariesPath); #ifdef Q_OS_WIN |