summaryrefslogtreecommitdiff
path: root/src/qtconcurrent
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2014-07-31 15:44:21 +0200
committerMarc Mutz <marc.mutz@kdab.com>2014-07-31 21:05:42 +0200
commit2767116c15c3116aed25d78ef3f31b36da1ea452 (patch)
treee31534d78c84edbdffd41e76bd3939fdfe24eb37 /src/qtconcurrent
parent01469dbaae7d5121513c712a904ae864fb0c1199 (diff)
downloadqttools-2767116c15c3116aed25d78ef3f31b36da1ea452.tar.gz
qtconcurrent/generaterun: allow to pass the output dir as an argument
The hard-coded paths don't exist anymore. Change-Id: Ie993f0a08d9dc2d89fa08911c18a09706af2fa24 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/qtconcurrent')
-rw-r--r--src/qtconcurrent/generaterun/main.cpp18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/qtconcurrent/generaterun/main.cpp b/src/qtconcurrent/generaterun/main.cpp
index ff26bd9da..6108fdca8 100644
--- a/src/qtconcurrent/generaterun/main.cpp
+++ b/src/qtconcurrent/generaterun/main.cpp
@@ -40,6 +40,7 @@
****************************************************************************/
#include <QDebug>
#include <QFile>
+#include <QDir>
#include "codegenerator.h"
using namespace CodeGenerator;
@@ -317,8 +318,19 @@ Item dollarQuote(Item item)
return Item("$") + item + Item("$");
}
-int main()
+static int usage(const char *executable)
{
+ qDebug("Usage: %s path/to/qtconcurrent", executable);
+ return EXIT_FAILURE;
+}
+
+int main(int argc, char *argv[])
+{
+ if (argc !=2)
+ return usage(argv[0]);
+
+ const QDir outdir(QFile::decodeName(argv[1]));
+
const int repeats = 6;
init();
Item run = (
@@ -369,7 +381,7 @@ int main()
Line("#endif")
);
- writeFile("../../../src/corelib/concurrent/qtconcurrentrun.h", run.generate());
+ writeFile(outdir.filePath("qtconcurrentrun.h"), run.generate());
Item storedFunctionCall = (
Line("/****************************************************************************") +
@@ -411,7 +423,7 @@ int main()
Line("#endif")
);
- writeFile("../../../src/corelib/concurrent/qtconcurrentstoredfunctioncall.h", storedFunctionCall.generate());
+ writeFile(outdir.filePath("qtconcurrentstoredfunctioncall.h"), storedFunctionCall.generate());
}