Mercurial > projects > qtd

diff generator/main.h @ 4:0a29ce1ae854

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CMake build script. Small fixes in examples.
author SokoL_SD
date Wed, 13 May 2009 19:01:55 +0000
parents e78566595089
children 347e4c7a9ba1
line wrap: on
line diff
--- a/generator/main.h	Wed May 13 17:34:40 2009 +0000
+++ b/generator/main.h	Wed May 13 19:01:55 2009 +0000
@@ -49,7 +49,8 @@
 
 struct Preprocess
 {
-    static bool preprocess(const QString &sourceFile, const QString &targetFile, const QString &commandLineIncludes = QString())
+    static bool preprocess(const QString &sourceFile, const QString &targetFile, const QString &commandLineIncludes = QString(),
+                           QString qtdir = QString(), QString qtdir_inc = QString())
     {
         rpp::pp_environment env;
         rpp::pp preprocess(env);
@@ -86,10 +87,12 @@
             includes += commandLineIncludes.split(path_splitter);
 
         // Include Qt
-        QString qtdir_inc = getenv ("QTDIR_INC");
-        QString qtdir = getenv ("QTDIR");
+        if (qtdir.isEmpty())
+            qtdir = getenv ("QTDIR");
+        if (qtdir_inc.isEmpty())
+            qtdir_inc = getenv ("QTDIR_INC");
         if (qtdir.isEmpty() && qtdir_inc.isEmpty()) {
-            qWarning("QTDIR and(or) QTDIR_INC environment variables not set. This may cause problems with finding the necessary include files.");
+            qWarning("QTDIR and QTDIR_INC environment variables not set. This may cause problems with finding the necessary include files.");
         } else {
             if (qtdir_inc.isEmpty())
                 qtdir_inc = qtdir + "/include";
@@ -101,7 +104,6 @@
             includes << qtdir_inc;
         }
 
-
         foreach (QString include, includes)
             preprocess.push_include_path(QDir::convertSeparators(include).toStdString());