1 files changed, 17 insertions, 10 deletions

diff --git a/src/declarative/qml/qdeclarativenotifier_p.h b/src/declarative/qml/qdeclarativenotifier_p.h
index 5f70f7d..14a7f82 100644
--- a/src/declarative/qml/qdeclarativenotifier_p.h
+++ b/src/declarative/qml/qdeclarativenotifier_p.h
@@ -99,8 +99,15 @@ private:
 
     enum { InvalidType, SignalType, NotifierType } type;
     union {
-        char signalData[sizeof(Signal)];
-        char notifierData[sizeof(Notifier)];
+        struct {
+            Signal *signal;
+            union {
+                char signalData[sizeof(Signal)];
+                qint64 q_for_alignment_1;
+                double q_for_alignment_2;
+            };
+        } signal;
+        Notifier notifier;
     };
 
     inline Notifier *toNotifier();
@@ -194,7 +201,7 @@ void QDeclarativeNotifierEndpoint::connect(QDeclarativeNotifier *notifier)
 void QDeclarativeNotifierEndpoint::disconnect()
 {
     if (type == SignalType) {
-        Signal *s = (Signal *)&signalData;
+        Signal *s = asSignal();
         if (s->source) {
             QMetaObject::disconnectOne(s->source, s->sourceSignal, target, targetMethod);
             s->source = 0;
@@ -223,18 +230,19 @@ QDeclarativeNotifierEndpoint::Notifier *QDeclarativeNotifierEndpoint::toNotifier
         s->~Signal();
     }
 
+    type = NotifierType;
     Notifier *n = asNotifier();
     n->next = 0;
     n->prev = 0;
     n->disconnected = 0;
     n->notifier = 0;
-    type = NotifierType;
     return n;
 }
 
 QDeclarativeNotifierEndpoint::Notifier *QDeclarativeNotifierEndpoint::asNotifier() 
 { 
-    return (Notifier *)(&notifierData); 
+    Q_ASSERT(type == NotifierType);
+    return &notifier;
 }
 
 QDeclarativeNotifierEndpoint::Signal *QDeclarativeNotifierEndpoint::toSignal()
@@ -243,16 +251,15 @@ QDeclarativeNotifierEndpoint::Signal *QDeclarativeNotifierEndpoint::toSignal()
         return asSignal();
 
     disconnect();
-    Signal *s = asSignal();
-    new (s) Signal;
+    signal.signal = new (&signal.signalData) Signal;
     type = SignalType;
-
-    return s;
+    return signal.signal;
 }
 
 QDeclarativeNotifierEndpoint::Signal *QDeclarativeNotifierEndpoint::asSignal() 
 { 
-    return (Signal *)(&signalData); 
+    Q_ASSERT(type == SignalType);
+    return signal.signal;
 }
 
 QT_END_NAMESPACE