summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
authorRobert Griebl <rgriebl@trolltech.com>2008-07-30 21:14:24 (GMT)
committerRobert Griebl <rgriebl@trolltech.com>2009-07-29 08:50:20 (GMT)
commitd7b688870aead912690188b324d370b920a7a600 (patch)
treeaac6c19d222ca3bad65cfbb850483a647013c67a /src/script
parente5262a0c29c743f2afd4ba249e8adff984c1ca83 (diff)
downloadQt-d7b688870aead912690188b324d370b920a7a600.zip
Qt-d7b688870aead912690188b324d370b920a7a600.tar.gz
Qt-d7b688870aead912690188b324d370b920a7a600.tar.bz2
Port of Qt to VxWorks
This makes Qt work on VxWorks 6.6+ in native (kernel) mode. * compiles with the WindRiver GNU toolchain (Linux only) * works with QWS (tested with the VNC driver only) * tested on PPC hardware and the x86 VxWorks simulator * no q3support, no phonon, no webkit * no QSharedMemory, no QSystemSemaphore, no QProcess * only one QApplication instance (flat address space) * filesystem support depends heavily on the quality of the native driver * QLibrary is just a dummy to make plugins work at all * qmake transparently creates VxWorks munching rules for static ctors * made auto-test cope with missing OS features A special note regarding the Q_FOREACH patch for dcc: when calling foreach(a,c) with c being a function returning a container, the compiler would generate 5 references to some labels (.LXXXX), which are not there (so the linker complains in the end). Seems like dcc doesn't really like the 'true ? 0 : <function call to get type>' statement Reviewed-By: Harald Fernengel
Diffstat (limited to 'src/script')
-rw-r--r--src/script/qscriptbuffer_p.h5
-rw-r--r--src/script/qscriptclassinfo_p.h4
-rw-r--r--src/script/qscriptecmadate.cpp10
-rw-r--r--src/script/qscriptgc_p.h4
-rw-r--r--src/script/qscriptmemberfwd_p.h4
-rw-r--r--src/script/qscriptsyntaxcheckresult_p.h4
-rw-r--r--src/script/qscriptvalueimplfwd_p.h4
7 files changed, 32 insertions, 3 deletions
diff --git a/src/script/qscriptbuffer_p.h b/src/script/qscriptbuffer_p.h
index 9db32a8..4b829ee 100644
--- a/src/script/qscriptbuffer_p.h
+++ b/src/script/qscriptbuffer_p.h
@@ -44,6 +44,11 @@
#include <QtCore/qglobal.h>
+#if defined(Q_OS_VXWORKS) && defined(m_data)
+# undef m_data
+#endif
+
+
QT_BEGIN_NAMESPACE
//
diff --git a/src/script/qscriptclassinfo_p.h b/src/script/qscriptclassinfo_p.h
index fb40d15..8f4d4fe 100644
--- a/src/script/qscriptclassinfo_p.h
+++ b/src/script/qscriptclassinfo_p.h
@@ -53,6 +53,10 @@
// We mean it.
//
+#if defined(Q_OS_VXWORKS) && defined(m_type)
+# undef m_type
+#endif
+
#include "qscriptclassdata_p.h"
#ifndef QT_NO_SCRIPT
diff --git a/src/script/qscriptecmadate.cpp b/src/script/qscriptecmadate.cpp
index 9b53724..8c91a25 100644
--- a/src/script/qscriptecmadate.cpp
+++ b/src/script/qscriptecmadate.cpp
@@ -58,10 +58,14 @@
#include <math.h>
#ifndef Q_WS_WIN
-# include <time.h>
-# include <sys/time.h>
+# include <time.h>
+# ifndef Q_OS_VXWORKS
+# include <sys/time.h>
+# else
+# include "qplatformdefs.h"
+# endif
#else
-# include <windows.h>
+# include <windows.h>
#endif
QT_BEGIN_NAMESPACE
diff --git a/src/script/qscriptgc_p.h b/src/script/qscriptgc_p.h
index 313519a..769e136 100644
--- a/src/script/qscriptgc_p.h
+++ b/src/script/qscriptgc_p.h
@@ -53,6 +53,10 @@
// We mean it.
//
+#if defined(Q_OS_VXWORKS) && defined(m_free)
+# undef m_free
+#endif
+
#include <QtCore/qglobal.h>
#ifndef QT_NO_SCRIPT
diff --git a/src/script/qscriptmemberfwd_p.h b/src/script/qscriptmemberfwd_p.h
index 056876b..6c12fef 100644
--- a/src/script/qscriptmemberfwd_p.h
+++ b/src/script/qscriptmemberfwd_p.h
@@ -53,6 +53,10 @@
// We mean it.
//
+#if defined(Q_OS_VXWORKS) && defined(m_flags)
+# undef m_flags
+#endif
+
#include <QtCore/qglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/script/qscriptsyntaxcheckresult_p.h b/src/script/qscriptsyntaxcheckresult_p.h
index d6049f8..9b51f7d 100644
--- a/src/script/qscriptsyntaxcheckresult_p.h
+++ b/src/script/qscriptsyntaxcheckresult_p.h
@@ -53,6 +53,10 @@
// We mean it.
//
+#if defined(Q_OS_VXWORKS) && defined(m_type)
+# undef m_type
+#endif
+
#ifndef QT_NO_SCRIPT
#include <QtCore/qatomic.h>
diff --git a/src/script/qscriptvalueimplfwd_p.h b/src/script/qscriptvalueimplfwd_p.h
index c30b32a..0953713 100644
--- a/src/script/qscriptvalueimplfwd_p.h
+++ b/src/script/qscriptvalueimplfwd_p.h
@@ -64,6 +64,10 @@ QT_BEGIN_NAMESPACE
// We mean it.
//
+#if defined(Q_OS_VXWORKS) && defined(m_type)
+# undef m_type
+#endif
+
class QScriptValueImpl;
typedef QList<QScriptValueImpl> QScriptValueImplList;