diff options
| author | Liang Qi <liang.qi@digia.com> | 2013-06-26 23:11:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-01 15:15:42 +0200 |
| commit | 8783de7f082c7a60821127ed8964884bae31a817 (patch) | |
| tree | 46b551a4934c68811808f8486dba0e418dd80a33 /examples | |
| parent | 3e21bfb18623a3ab9a9b31d489ae20f06e223c5d (diff) | |
Support namespaced build
Change-Id: Ie2073c629dcca6e8bdf33b803c9015b0373fc3a5
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/macunifiedtoolbar/preferenceswindow.cpp | 1 | ||||
| -rw-r--r-- | examples/macunifiedtoolbar/preferenceswindow.h | 6 | ||||
| -rw-r--r-- | examples/macunifiedtoolbar/window.cpp | 1 | ||||
| -rw-r--r-- | examples/macunifiedtoolbar/window.h | 5 |
4 files changed, 2 insertions, 11 deletions
diff --git a/examples/macunifiedtoolbar/preferenceswindow.cpp b/examples/macunifiedtoolbar/preferenceswindow.cpp index c10f937..488ef5f 100644 --- a/examples/macunifiedtoolbar/preferenceswindow.cpp +++ b/examples/macunifiedtoolbar/preferenceswindow.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include "preferenceswindow.h" -#include "ui_preferenceswindow.h" #include <QMacNativeToolBar> #include <QTimer> diff --git a/examples/macunifiedtoolbar/preferenceswindow.h b/examples/macunifiedtoolbar/preferenceswindow.h index 12d0937..0accb83 100644 --- a/examples/macunifiedtoolbar/preferenceswindow.h +++ b/examples/macunifiedtoolbar/preferenceswindow.h @@ -43,11 +43,7 @@ #define PREFERENCESWINDOW_H #include <QMainWindow> - -namespace Ui -{ - class PreferencesWindow; -} +#include "ui_preferenceswindow.h" class PreferencesWindow : public QMainWindow { diff --git a/examples/macunifiedtoolbar/window.cpp b/examples/macunifiedtoolbar/window.cpp index 6a61612..dde27e3 100644 --- a/examples/macunifiedtoolbar/window.cpp +++ b/examples/macunifiedtoolbar/window.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include "window.h" -#include "ui_window.h" #include "preferenceswindow.h" #include <QMacNativeToolBar> #include <QDesktopWidget> diff --git a/examples/macunifiedtoolbar/window.h b/examples/macunifiedtoolbar/window.h index bb0a249..7f0dc54 100644 --- a/examples/macunifiedtoolbar/window.h +++ b/examples/macunifiedtoolbar/window.h @@ -44,10 +44,7 @@ #include <QWidget> #include "qmactoolbutton.h" - -namespace Ui { -class Window; -} +#include "ui_window.h" class WindowPrivate; class Window : public QWidget |