From c264c0d2137d15ec3746ed0f3bd80f225671b4a6 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Mon, 1 Jul 2013 10:25:03 +0200
Subject: C++: Fix resolving ui_* files in CppPreprocessor

The working copy contains the artificial ui_* files and therefore we
have to consider it while resolving include files.

Task-number: QTCREATORBUG-9683
Change-Id: Icb3387b4cd885b3652bae3f1da465d3e0f633332
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
---
 .../cppmodelmanager/testdata_guiproject1/main.cpp  | 13 ++++++++++++
 .../testdata_guiproject1/mainwindow.cpp            | 16 +++++++++++++++
 .../testdata_guiproject1/mainwindow.h              | 24 ++++++++++++++++++++++
 .../testdata_guiproject1/mainwindow.ui             | 24 ++++++++++++++++++++++
 .../testdata_guiproject1/testdata_guiproject1.pro  |  9 ++++++++
 5 files changed, 86 insertions(+)
 create mode 100644 tests/cppmodelmanager/testdata_guiproject1/main.cpp
 create mode 100644 tests/cppmodelmanager/testdata_guiproject1/mainwindow.cpp
 create mode 100644 tests/cppmodelmanager/testdata_guiproject1/mainwindow.h
 create mode 100644 tests/cppmodelmanager/testdata_guiproject1/mainwindow.ui
 create mode 100644 tests/cppmodelmanager/testdata_guiproject1/testdata_guiproject1.pro

(limited to 'tests/cppmodelmanager')

diff --git a/tests/cppmodelmanager/testdata_guiproject1/main.cpp b/tests/cppmodelmanager/testdata_guiproject1/main.cpp
new file mode 100644
index 0000000000..50ca345343
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_guiproject1/main.cpp
@@ -0,0 +1,13 @@
+// Copyright license
+
+#include "mainwindow.h"
+#include <QApplication>
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    MainWindow w;
+    w.show();
+
+    return a.exec();
+}
diff --git a/tests/cppmodelmanager/testdata_guiproject1/mainwindow.cpp b/tests/cppmodelmanager/testdata_guiproject1/mainwindow.cpp
new file mode 100644
index 0000000000..495189aa3b
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_guiproject1/mainwindow.cpp
@@ -0,0 +1,16 @@
+// Copyright license
+
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::MainWindow)
+{
+    ui->setupUi(this);
+}
+
+MainWindow::~MainWindow()
+{
+    delete ui;
+}
diff --git a/tests/cppmodelmanager/testdata_guiproject1/mainwindow.h b/tests/cppmodelmanager/testdata_guiproject1/mainwindow.h
new file mode 100644
index 0000000000..6dae9639b6
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_guiproject1/mainwindow.h
@@ -0,0 +1,24 @@
+// Copyright license
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+
+namespace Ui {
+class MainWindow;
+}
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+
+private:
+    Ui::MainWindow *ui;
+};
+
+#endif // MAINWINDOW_H
diff --git a/tests/cppmodelmanager/testdata_guiproject1/mainwindow.ui b/tests/cppmodelmanager/testdata_guiproject1/mainwindow.ui
new file mode 100644
index 0000000000..6050363fa7
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_guiproject1/mainwindow.ui
@@ -0,0 +1,24 @@
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MainWindow</string>
+  </property>
+  <widget class="QMenuBar" name="menuBar" />
+  <widget class="QToolBar" name="mainToolBar" />
+  <widget class="QWidget" name="centralWidget" />
+  <widget class="QStatusBar" name="statusBar" />
+ </widget>
+ <layoutDefault spacing="6" margin="11" />
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/cppmodelmanager/testdata_guiproject1/testdata_guiproject1.pro b/tests/cppmodelmanager/testdata_guiproject1/testdata_guiproject1.pro
new file mode 100644
index 0000000000..0fdc70ad7b
--- /dev/null
+++ b/tests/cppmodelmanager/testdata_guiproject1/testdata_guiproject1.pro
@@ -0,0 +1,9 @@
+QT       += core gui
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = testdata_guiproject1
+TEMPLATE = app
+
+SOURCES += main.cpp mainwindow.cpp
+HEADERS  += mainwindow.h
+FORMS    += mainwindow.ui
-- 
cgit v1.2.3