[PATCH] QT 4.4.0-snapshot-20070420 [missing q_atomic_*]

[Brad Hards]

On Sunday 29 April 2007 21:02, Brad Hards wrote:
> On Sunday 29 April 2007 19:55, Simon Hausmann wrote:
> > I could reproduce the exact same problem with a smaller testcase on one
> > of our old Solaris boxes and I can confirm this behaviour.
> >
> > While qt_functions.prf, which adds QtDBus to the include search path,
> > does the right thing by prepending to INCLUDEPATH the order of evaluation
> > /after/ parsing the .pro file seems to be the real culprit. We're sure as
> > hell not going to change this aspect of qmake so short before the 4.3
> > release, so your suggested workaround of including QtDBus/QtDBus seems
> > like the best option. I've submitted this fix.
>
> Note that this also occurs in the examples (which I guess you may not have
> tried if you had an old solaris box ;-)
>
> $ svn diff examples/script/qscript/qdbusbinding.h
> Index: examples/script/qscript/qdbusbinding.h
> ===================================================================
> --- examples/script/qscript/qdbusbinding.h      (revision 656356)
> +++ examples/script/qscript/qdbusbinding.h      (working copy)
> @@ -24,7 +24,7 @@
>  #ifndef QDBUSBINDING_H
>  #define QDBUSBINDING_H
>
> -#include <QtDBus>
> +#include <QtDBus/QtDBus>
>  #include <QtScript/qscriptable.h>
>  #include <QtScript/qscriptengine.h>

and in the demos:
$ svn diff demos/spreadsheet/main.cpp
Index: demos/spreadsheet/main.cpp
===================================================================
--- demos/spreadsheet/main.cpp  (revision 656356)
+++ demos/spreadsheet/main.cpp  (working copy)
@@ -255,7 +255,7 @@
 }

 #if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
-#include <QtDBus>
+#include <QtDBus/QtDBus>

 class SpreadSheetAdaptor : public QDBusAbstractAdaptor

Brad
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20070429/10a9fca9/attachment.sig>