Changeset 846 for trunk/src/gui/kernel/qx11embed_x11.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qx11embed_x11.cpp (modified) (5 diffs)

trunk/src/gui/kernel/qx11embed_x11.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -48 +48 @@
 #include <qstyle.h>
 #include <qstyleoption.h>
-#include <qdatetime.h>
+#include <q.h>
 #include <qpointer.h>
 #include <qdebug.h>
@@ -1071 +1071 @@
     d->focusProxy->setAttribute(Qt::WA_NativeWindow);
     d->focusProxy->setAttribute(Qt::WA_DontCreateNativeAncestors);
+
     d->focusProxy->setGeometry(-1, -1, 1, 1);
 
@@ -1136 +1137 @@
 /*! \internal
 
-    Returns wether or not the windows' embedded flag is set.
+    Returns wether or not the windows' embedded flag is set.
 */
 bool QX11EmbedContainerPrivate::isEmbedded() const
@@ -1232 +1233 @@
       preemptively workaround buggy window managers.
     */
-    QTime t;
+    Q t;
     t.start();