summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-07-20 11:10:17 +0200
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-07-20 13:00:35 +0200
commit329c9329a61267ede929a96af6b26a286c666fc8 (patch)
treec084eff5a5f4b2e9adf91aab338d5da4efab9b99
parent41c1049db2202c1ef5e97243f1ee2695db78d9de (diff)
WinCE build fixes. Use qgetenv instead of getenv...
Reviewed-by: thartman
-rw-r--r--tests/auto/bic/tst_bic.cpp4
-rw-r--r--tests/auto/compilerwarnings/tst_compilerwarnings.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp
index e7a0c04cd2..cec5e76ea9 100644
--- a/tests/auto/bic/tst_bic.cpp
+++ b/tests/auto/bic/tst_bic.cpp
@@ -145,7 +145,7 @@ void tst_Bic::initTestCase_data()
void tst_Bic::initTestCase()
{
- QString qtDir = QString::fromLocal8Bit(getenv("QTDIR"));
+ QString qtDir = QString::fromLocal8Bit(qgetenv("QTDIR"));
QVERIFY2(!qtDir.isEmpty(), "This test needs $QTDIR");
if (qgetenv("PATH").contains("teambuilder"))
@@ -220,7 +220,7 @@ QBic::Info tst_Bic::getCurrentInfo(const QString &libName)
tmpQFile.write(tmpFileContents);
tmpQFile.flush();
- QString qtDir = QString::fromLocal8Bit(getenv("QTDIR"));
+ QString qtDir = QString::fromLocal8Bit(qgetenv("QTDIR"));
#ifdef Q_OS_WIN
qtDir.replace('\\', '/');
#endif
diff --git a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
index 2f5cf6caa9..57795c963c 100644
--- a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
+++ b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
@@ -67,8 +67,8 @@ private slots:
static QStringList getFeatures()
{
QStringList srcDirs;
- srcDirs << QString::fromLocal8Bit(getenv("QTDIR"))
- << QString::fromLocal8Bit(getenv("QTSRCDIR"));
+ srcDirs << QString::fromLocal8Bit(qgetenv("QTDIR"))
+ << QString::fromLocal8Bit(qgetenv("QTSRCDIR"));
QString featurefile;
foreach (QString dir, srcDirs) {
@@ -157,7 +157,7 @@ void tst_CompilerWarnings::warnings()
QStringList args;
QString compilerName;
- static QString qtDir = QString::fromLocal8Bit(getenv("QTDIR"));
+ static QString qtDir = QString::fromLocal8Bit(qgetenv("QTDIR"));
QVERIFY2(!qtDir.isEmpty(), "This test needs $QTDIR");
args << cflags;