compiler warning fixes

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/designer/qdesignercommon_p.h b/src/designer/qdesignercommon_p.h
index d42ce8e..9fa2e6c 100644 (file)
--- a/src/designer/qdesignercommon_p.h
+++ b/src/designer/qdesignercommon_p.h
@@ -18,7 +18,7 @@ static const char *SplitterPosition = "SplitterPosition";
 // We know that the parent of the sheet is the extension manager
 // whose parent is the core.
 
-static QDesignerFormEditorInterface *formEditorForObject(QObject *o) {
+inline static QDesignerFormEditorInterface *formEditorForObject(QObject *o) {
     do {
         if (QDesignerFormEditorInterface* core = qobject_cast<QDesignerFormEditorInterface*>(o))
             return core;
@@ -28,7 +28,7 @@ static QDesignerFormEditorInterface *formEditorForObject(QObject *o) {
     return 0;
 }
 
-static void recursiveUpdate(QWidget *w)
+inline static void recursiveUpdate(QWidget *w)
 {
     w->update();
 

diff --git a/src/script/bridge/qscriptdeclarativeclass_p.h b/src/script/bridge/qscriptdeclarativeclass_p.h
index 825e400..bb34c58 100644 (file)
--- a/src/script/bridge/qscriptdeclarativeclass_p.h
+++ b/src/script/bridge/qscriptdeclarativeclass_p.h
@@ -47,7 +47,6 @@ class QScriptContext;
 class Q_SCRIPT_EXPORT QScriptDeclarativeClass
 {
 public:
-#define QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE
     class Q_SCRIPT_EXPORT Value
     {
     public: