Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
69e141c3
Commit
69e141c3
authored
Feb 16, 2010
by
ck
Browse files
QML stuff: Fix compilation for namespaced Qt.
parent
e073099c
Changes
49
Hide whitespace changes
Inline
Side-by-side
src/libs/qmljs/parser/qmljslexer.cpp
View file @
69e141c3
...
...
@@ -56,9 +56,11 @@
#include <stdio.h>
#include <string.h>
QT_QML_BEGIN_NAMESPACE
QT_BEGIN_NAMESPACE
extern
double
qstrtod
(
const
char
*
s00
,
char
const
**
se
,
bool
*
ok
);
QT_END_NAMESPACE
QT_QML_BEGIN_NAMESPACE
#define shiftWindowsLineBreak() \
do { \
...
...
src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h
View file @
69e141c3
...
...
@@ -32,7 +32,9 @@
#include "formeditoritem.h"
QT_BEGIN_NAMESPACE
class
QGraphicsItem
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/formeditor/formeditoritem.h
View file @
69e141c3
...
...
@@ -35,7 +35,9 @@
#include <qmlitemnode.h>
#include "snappinglinecreator.h"
QT_BEGIN_NAMESPACE
class
QTimeLine
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/formeditor/formeditorscene.h
View file @
69e141c3
...
...
@@ -37,8 +37,9 @@
#include <qmlitemnode.h>
#include "abstractformeditortool.h"
QT_BEGIN_NAMESPACE
class
QGraphicsSceneMouseEvent
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/formeditor/formeditorview.h
View file @
69e141c3
...
...
@@ -32,8 +32,10 @@
#include <qmlmodelview.h>
QT_BEGIN_NAMESPACE
class
QGraphicsScene
;
class
QGraphicsSceneMouseEvent
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/formeditor/formeditorwidget.h
View file @
69e141c3
...
...
@@ -32,7 +32,9 @@
#include <QWidget>
QT_BEGIN_NAMESPACE
class
QActionGroup
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/formeditor/numberseriesaction.h
View file @
69e141c3
...
...
@@ -32,7 +32,9 @@
#include <QWidgetAction>
QT_BEGIN_NAMESPACE
class
QStandardItemModel
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/formeditor/snapper.h
View file @
69e141c3
...
...
@@ -32,7 +32,9 @@
#include "formeditoritem.h"
QT_BEGIN_NAMESPACE
class
QLineF
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/formeditor/toolbox.h
View file @
69e141c3
...
...
@@ -32,7 +32,9 @@
#include <QWidget>
QT_BEGIN_NAMESPACE
class
QToolBar
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/formeditor/zoomaction.h
View file @
69e141c3
...
...
@@ -32,7 +32,9 @@
#include <QWidgetAction>
QT_BEGIN_NAMESPACE
class
QAbstractItemModel
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/integration/componentaction.h
View file @
69e141c3
...
...
@@ -33,7 +33,9 @@
#include <QWidgetAction>
#include <QWeakPointer>
QT_BEGIN_NAMESPACE
class
QComboBox
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/integration/componentview.h
View file @
69e141c3
...
...
@@ -35,7 +35,9 @@
#include <QStringList>
QT_BEGIN_NAMESPACE
class
QStandardItemModel
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/integration/designdocumentcontroller.h
View file @
69e141c3
...
...
@@ -35,12 +35,14 @@
#include <QtCore/QObject>
#include <QtCore/QString>
QT_BEGIN_NAMESPACE
class
QUndoStack
;
class
QWidget
;
class
QIODevice
;
class
QProcess
;
class
QPlainTextEdit
;
class
QmlError
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/integration/integrationcore.h
View file @
69e141c3
...
...
@@ -32,8 +32,10 @@
#include <QtCore/QObject>
QT_BEGIN_NAMESPACE
class
QWidget
;
class
QDialog
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h
View file @
69e141c3
...
...
@@ -32,7 +32,9 @@
#include <QTimeLine>
#include <QDrag>
QT_BEGIN_NAMESPACE
class
QMimeData
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h
View file @
69e141c3
...
...
@@ -32,9 +32,11 @@
#include <QtGui/QFrame>
QT_BEGIN_NAMESPACE
class
QGraphicsItem
;
class
QPixmap
;
class
QMimeData
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
View file @
69e141c3
...
...
@@ -36,7 +36,9 @@
#include <QDebug>
#include <QTimeLine>
QT_BEGIN_NAMESPACE
class
QLabel
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/navigator/navigatortreeview.h
View file @
69e141c3
...
...
@@ -37,10 +37,12 @@
#include <QPainter>
QT_BEGIN_NAMESPACE
class
QTreeView
;
class
QStandardItem
;
class
QItemSelection
;
class
QModelIndex
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/navigator/navigatorview.h
View file @
69e141c3
...
...
@@ -34,10 +34,12 @@
#include <QWeakPointer>
QT_BEGIN_NAMESPACE
class
QTreeView
;
class
QStandardItem
;
class
QItemSelection
;
class
QModelIndex
;
QT_END_NAMESPACE
namespace
QmlDesigner
{
...
...
src/plugins/qmldesigner/components/pluginmanager/iplugin.h
View file @
69e141c3
...
...
@@ -51,6 +51,8 @@ public:
}
// namespace QmlDesigner
QT_BEGIN_NAMESPACE
Q_DECLARE_INTERFACE
(
QmlDesigner
::
IPlugin
,
QMLDESIGNER_PLUGIN_INTERFACE
)
QT_END_NAMESPACE
#endif // IPLUGIN_H
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment