aboutsummaryrefslogtreecommitdiffstats
path: root/tests/genericprojectmanager
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2014-06-18 16:16:55 +0200
committerNikolai Kosjar <nikolai.kosjar@digia.com>2014-08-21 13:11:03 +0200
commit876ea282d269cd03515506f534c4ea47427e2d05 (patch)
tree26fa34377a910cb0a643cefd93b202c7fc6fea7b /tests/genericprojectmanager
parentbb8575c60c89f84b0d7cb76cb8afff48e32c9027 (diff)
GenericProject: put different languages into separate project parts.
This is in preparation for changes to the ProjectParts, where one part can only hold files for 1 language. Change-Id: I5e9a1a803ecc3ecbb36added0d0094df63922549 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'tests/genericprojectmanager')
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject1/Glue.h10
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject1/Glue.mm8
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject1/MyViewController.h5
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject1/MyViewController.m7
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject1/header.h4
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject1/main.cpp3
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.config1
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.creator1
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.files6
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.includes0
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject2/header.hpp6
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject2/impl.c4
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject2/main.cpp6
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.config1
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.creator1
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.files3
-rw-r--r--tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.includes0
17 files changed, 66 insertions, 0 deletions
diff --git a/tests/genericprojectmanager/testdata_mixedproject1/Glue.h b/tests/genericprojectmanager/testdata_mixedproject1/Glue.h
new file mode 100644
index 0000000000..dd39049add
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject1/Glue.h
@@ -0,0 +1,10 @@
+#ifndef GLUE_H
+#define GLUE_H
+
+struct Glue {
+ struct it {
+ static void together();
+ };
+};
+
+#endif // GLUE_H
diff --git a/tests/genericprojectmanager/testdata_mixedproject1/Glue.mm b/tests/genericprojectmanager/testdata_mixedproject1/Glue.mm
new file mode 100644
index 0000000000..452d049616
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject1/Glue.mm
@@ -0,0 +1,8 @@
+#include "Glue.h"
+
+@class NSApp;
+
+void Glue::it::together()
+{
+ [[NSApp dockTile] setContentView:nil];
+}
diff --git a/tests/genericprojectmanager/testdata_mixedproject1/MyViewController.h b/tests/genericprojectmanager/testdata_mixedproject1/MyViewController.h
new file mode 100644
index 0000000000..533cfb6578
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject1/MyViewController.h
@@ -0,0 +1,5 @@
+@class NSViewController;
+
+@interface AppDelegate : NSViewController
+
+@end
diff --git a/tests/genericprojectmanager/testdata_mixedproject1/MyViewController.m b/tests/genericprojectmanager/testdata_mixedproject1/MyViewController.m
new file mode 100644
index 0000000000..99277051ce
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject1/MyViewController.m
@@ -0,0 +1,7 @@
+#import "MyViewController.h"
+
+@interface MyViewController ()
+@end
+
+@implementation MyViewController
+@end
diff --git a/tests/genericprojectmanager/testdata_mixedproject1/header.h b/tests/genericprojectmanager/testdata_mixedproject1/header.h
new file mode 100644
index 0000000000..689ec03871
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject1/header.h
@@ -0,0 +1,4 @@
+#ifndef HEADER_H
+#define HEADER_H
+
+#endif // HEADER_H
diff --git a/tests/genericprojectmanager/testdata_mixedproject1/main.cpp b/tests/genericprojectmanager/testdata_mixedproject1/main.cpp
new file mode 100644
index 0000000000..5047a34e39
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject1/main.cpp
@@ -0,0 +1,3 @@
+int main()
+{
+}
diff --git a/tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.config b/tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.config
new file mode 100644
index 0000000000..9dcf447363
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.config
@@ -0,0 +1 @@
+// Nothing to be seen, move along.
diff --git a/tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.creator b/tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.creator
new file mode 100644
index 0000000000..e94cbbd302
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.creator
@@ -0,0 +1 @@
+[General]
diff --git a/tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.files b/tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.files
new file mode 100644
index 0000000000..52ae971ccd
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.files
@@ -0,0 +1,6 @@
+main.cpp
+header.h
+MyViewController.h
+MyViewController.m
+Glue.h
+Glue.mm
diff --git a/tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.includes b/tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.includes
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject1/mixedproject1.includes
diff --git a/tests/genericprojectmanager/testdata_mixedproject2/header.hpp b/tests/genericprojectmanager/testdata_mixedproject2/header.hpp
new file mode 100644
index 0000000000..ebc2cf627a
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject2/header.hpp
@@ -0,0 +1,6 @@
+#ifndef HEADER_HPP
+#define HEADER_HPP
+
+extern "C" void impl();
+
+#endif // HEADER_HPP
diff --git a/tests/genericprojectmanager/testdata_mixedproject2/impl.c b/tests/genericprojectmanager/testdata_mixedproject2/impl.c
new file mode 100644
index 0000000000..d514ce6ea4
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject2/impl.c
@@ -0,0 +1,4 @@
+void impl()
+{
+ abort();
+}
diff --git a/tests/genericprojectmanager/testdata_mixedproject2/main.cpp b/tests/genericprojectmanager/testdata_mixedproject2/main.cpp
new file mode 100644
index 0000000000..7dfe0b19fa
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject2/main.cpp
@@ -0,0 +1,6 @@
+#include "header.hpp"
+
+int main()
+{
+ impl();
+}
diff --git a/tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.config b/tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.config
new file mode 100644
index 0000000000..9dcf447363
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.config
@@ -0,0 +1 @@
+// Nothing to be seen, move along.
diff --git a/tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.creator b/tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.creator
new file mode 100644
index 0000000000..e94cbbd302
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.creator
@@ -0,0 +1 @@
+[General]
diff --git a/tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.files b/tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.files
new file mode 100644
index 0000000000..546405cf8c
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.files
@@ -0,0 +1,3 @@
+main.cpp
+header.hpp
+impl.c
diff --git a/tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.includes b/tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.includes
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/genericprojectmanager/testdata_mixedproject2/mixedproject2.includes