get rid of QTDIR environment variable

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/cmake/dbg.sh.cmake b/cmake/dbg.sh.cmake
index 6acc870..beaf7a2 100644 (file)
--- a/cmake/dbg.sh.cmake
+++ b/cmake/dbg.sh.cmake
@@ -7,7 +7,6 @@ if [ -z "$LD_LIBRARY_PATH" ];then
 else
     export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib:$LD_LIBRARY_PATH"
 fi
-export QTDIR="@CMAKE_SOURCE_DIR@"
 export QT_PLUGIN_PATH="@CMAKE_BINARY_DIR@/plugins"
 export QML_IMPORT_PATH="@CMAKE_BINARY_DIR@/imports"
 

diff --git a/cmake/exec.sh.cmake b/cmake/exec.sh.cmake
index 54ccdab..5a721bf 100644 (file)
--- a/cmake/exec.sh.cmake
+++ b/cmake/exec.sh.cmake
@@ -7,7 +7,6 @@ if [ -z "$LD_LIBRARY_PATH" ];then
 else
     export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib:$LD_LIBRARY_PATH"
 fi
-export QTDIR="@CMAKE_SOURCE_DIR@"
 export QT_PLUGIN_PATH="@CMAKE_BINARY_DIR@/plugins"
 export QML_IMPORT_PATH="@CMAKE_BINARY_DIR@/imports"
 

diff --git a/cmake/trace.sh.cmake b/cmake/trace.sh.cmake
index 71a9f54..ea76321 100644 (file)
--- a/cmake/trace.sh.cmake
+++ b/cmake/trace.sh.cmake
@@ -7,7 +7,6 @@ if [ -z "$LD_LIBRARY_PATH" ];then
 else
     export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib:$LD_LIBRARY_PATH"
 fi
-export QTDIR="@CMAKE_SOURCE_DIR@"
 export QT_PLUGIN_PATH="@CMAKE_BINARY_DIR@/plugins"
 export QML_IMPORT_PATH="@CMAKE_BINARY_DIR@/imports"
 

diff --git a/tests/benchmarks/core/io/qdiriterator/main.cpp b/tests/benchmarks/core/io/qdiriterator/main.cpp
index 3730ff4..bb47c36 100644 (file)
--- a/tests/benchmarks/core/io/qdiriterator/main.cpp
+++ b/tests/benchmarks/core/io/qdiriterator/main.cpp
@@ -55,17 +55,9 @@ private slots:
 
 void tst_qdiriterator::data()
 {
-    const char *qtdir = ::getenv("QTDIR");
-    if (!qtdir) {
-        fprintf(stderr, "QTDIR not set\n");
-        exit(1);
-    }
-
-    QTest::addColumn<QByteArray>("dirpath");
-    QByteArray ba = QByteArray(qtdir) + "/src/core";
-    QByteArray ba1 = ba + "/io";
-    QTest::newRow(ba) << ba;
-    //QTest::newRow(ba1) << ba1;
+    QTest::addColumn<QString>("dirpath");
+    QString absolute = QDir::cleanPath(QString::fromLatin1(SRCDIR "/../.."));
+    QTest::newRow(absolute.toLatin1()) << absolute;
 }
 
 static int posix_helper(const char *dirpath)
@@ -100,26 +92,26 @@ static int posix_helper(const char *dirpath)
 
 void tst_qdiriterator::posix()
 {
-    QFETCH(QByteArray, dirpath);
+    QFETCH(QString, dirpath);
 
     int count = 0;
-    QString path = QString::fromLatin1(dirpath);
+    QByteArray path = dirpath.toLatin1();
     QBENCHMARK {
-        count = posix_helper(dirpath.constData());
+        count = posix_helper(path.constData());
     }
     qDebug() << count;
 }
 
 void tst_qdiriterator::diriterator()
 {
-    QFETCH(QByteArray, dirpath);
+    QFETCH(QString, dirpath);
 
     int count = 0;
 
     QBENCHMARK {
         int c = 0;
 
-        QDirIterator dir(QString::fromLatin1(dirpath),
+        QDirIterator dir(dirpath,
             //QDir::AllEntries | QDir::Hidden | QDir::NoDotAndDotDot,
             //QDir::AllEntries | QDir::Hidden,
             QDir::Files,
@@ -142,7 +134,7 @@ void tst_qdiriterator::diriterator()
 
 void tst_qdiriterator::fsiterator()
 {
-    QFETCH(QByteArray, dirpath);
+    QFETCH(QString, dirpath);
 
     int count = 0;
     int dump = 0;
@@ -151,7 +143,7 @@ void tst_qdiriterator::fsiterator()
         int c = 0;
 
         dump && printf("\n\n\n\n");
-        QFileSystemIterator dir(QString::fromLatin1(dirpath),
+        QFileSystemIterator dir(dirpath,
             //QDir::AllEntries | QDir::Hidden | QDir::NoDotAndDotDot,
             //QDir::AllEntries | QDir::Hidden,
             //QDir::Files | QDir::NoDotAndDotDot,