diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-09 13:57:14 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-09 12:33:35 +0000 |
| commit | 861fef9407299669706d952525434011791c1d2d (patch) | |
| tree | 22d48b099d003f4f053002580ee62ac3e0ab9ac2 | |
| parent | afe5f9701d69e7cdb59a80bd8282d469a74b90ec (diff) | |
Rename the generator/makefile directory
A directory called "makefile" breaks the make tool on macOS:
make[2]: *** Makefile: Is a directory. Stop.
Change-Id: Ic1f0f99f1599d6464d2596282be19603b8476a3d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/plugins/generator/generator.pro | 2 | ||||
| -rw-r--r-- | src/plugins/generator/makefilegenerator/makefilegenerator.cpp (renamed from src/plugins/generator/makefile/makefilegenerator.cpp) | 0 | ||||
| -rw-r--r-- | src/plugins/generator/makefilegenerator/makefilegenerator.h (renamed from src/plugins/generator/makefile/makefilegenerator.h) | 0 | ||||
| -rw-r--r-- | src/plugins/generator/makefilegenerator/makefilegenerator.pro (renamed from src/plugins/generator/makefile/makefile.pro) | 0 | ||||
| -rw-r--r-- | src/plugins/generator/makefilegenerator/makefilegenerator.qbs (renamed from src/plugins/generator/makefile/makefilegenerator.qbs) | 0 | ||||
| -rw-r--r-- | src/plugins/generator/makefilegenerator/makefilegeneratorplugin.cpp (renamed from src/plugins/generator/makefile/makefilegeneratorplugin.cpp) | 0 | ||||
| -rw-r--r-- | src/plugins/plugins.qbs | 2 |
7 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/generator/generator.pro b/src/plugins/generator/generator.pro index f51646541..1607aa14d 100644 --- a/src/plugins/generator/generator.pro +++ b/src/plugins/generator/generator.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -SUBDIRS = clangcompilationdb makefile visualstudio +SUBDIRS = clangcompilationdb makefilegenerator visualstudio diff --git a/src/plugins/generator/makefile/makefilegenerator.cpp b/src/plugins/generator/makefilegenerator/makefilegenerator.cpp index 267bd90dc..267bd90dc 100644 --- a/src/plugins/generator/makefile/makefilegenerator.cpp +++ b/src/plugins/generator/makefilegenerator/makefilegenerator.cpp diff --git a/src/plugins/generator/makefile/makefilegenerator.h b/src/plugins/generator/makefilegenerator/makefilegenerator.h index b2b23f081..b2b23f081 100644 --- a/src/plugins/generator/makefile/makefilegenerator.h +++ b/src/plugins/generator/makefilegenerator/makefilegenerator.h diff --git a/src/plugins/generator/makefile/makefile.pro b/src/plugins/generator/makefilegenerator/makefilegenerator.pro index fae962fbb..fae962fbb 100644 --- a/src/plugins/generator/makefile/makefile.pro +++ b/src/plugins/generator/makefilegenerator/makefilegenerator.pro diff --git a/src/plugins/generator/makefile/makefilegenerator.qbs b/src/plugins/generator/makefilegenerator/makefilegenerator.qbs index baabc43e3..baabc43e3 100644 --- a/src/plugins/generator/makefile/makefilegenerator.qbs +++ b/src/plugins/generator/makefilegenerator/makefilegenerator.qbs diff --git a/src/plugins/generator/makefile/makefilegeneratorplugin.cpp b/src/plugins/generator/makefilegenerator/makefilegeneratorplugin.cpp index 01b843a06..01b843a06 100644 --- a/src/plugins/generator/makefile/makefilegeneratorplugin.cpp +++ b/src/plugins/generator/makefilegenerator/makefilegeneratorplugin.cpp diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs index 392145b7f..dcc1ded87 100644 --- a/src/plugins/plugins.qbs +++ b/src/plugins/plugins.qbs @@ -4,7 +4,7 @@ Project { name: "qbs plugins" references: [ "generator/clangcompilationdb/clangcompilationdb.qbs", - "generator/makefile/makefilegenerator.qbs", + "generator/makefilegenerator/makefilegenerator.qbs", "generator/visualstudio/visualstudio.qbs", "scanner/cpp/cpp.qbs", "scanner/qt/qt.qbs" |