forked from qt-creator/qt-creator
QmlJSCodeStyleSettingsPage: compile fix
Was not compilable with namespaced Qt Change-Id: Ieab68bb67e6421afbc4e07417c0196d419697f70 Reviewed-on: http://codereview.qt.nokia.com/100 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
This commit is contained in:
@@ -28,7 +28,7 @@ namespace Internal {
|
|||||||
QmlJSCodeStylePreferencesWidget::QmlJSCodeStylePreferencesWidget(QWidget *parent) :
|
QmlJSCodeStylePreferencesWidget::QmlJSCodeStylePreferencesWidget(QWidget *parent) :
|
||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
m_tabPreferences(0),
|
m_tabPreferences(0),
|
||||||
m_ui(new ::Ui::QmlJSCodeStyleSettingsPage)
|
m_ui(new Ui::QmlJSCodeStyleSettingsPage)
|
||||||
{
|
{
|
||||||
m_ui->setupUi(this);
|
m_ui->setupUi(this);
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,6 @@
|
|||||||
#include <QtCore/QPointer>
|
#include <QtCore/QPointer>
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
namespace Ui {
|
|
||||||
class QmlJSCodeStyleSettingsPage;
|
|
||||||
}
|
|
||||||
class QSettings;
|
class QSettings;
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
@@ -21,6 +18,10 @@ namespace TextEditor {
|
|||||||
namespace QmlJSTools {
|
namespace QmlJSTools {
|
||||||
namespace Internal {
|
namespace Internal {
|
||||||
|
|
||||||
|
namespace Ui {
|
||||||
|
class QmlJSCodeStyleSettingsPage;
|
||||||
|
}
|
||||||
|
|
||||||
class QmlJSCodeStylePreferencesWidget : public QWidget
|
class QmlJSCodeStylePreferencesWidget : public QWidget
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<ui version="4.0">
|
<ui version="4.0">
|
||||||
<class>QmlJSCodeStyleSettingsPage</class>
|
<class>QmlJSTools::Internal::QmlJSCodeStyleSettingsPage</class>
|
||||||
<widget class="QWidget" name="QmlJSCodeStyleSettingsPage">
|
<widget class="QWidget" name="QmlJSCodeStyleSettingsPage">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
|
|||||||
Reference in New Issue
Block a user