Changeset 846 for trunk/src/gui/widgets/qeffects.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/widgets/qeffects.cpp (modified) (5 diffs)

trunk/src/gui/widgets/qeffects.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])
@@ -42 +42 @@
 #include "qapplication.h"
 #ifndef QT_NO_EFFECTS
-#include "qdatetime.h"
 #include "qdesktopwidget.h"
 #include "qeffects_p.h"
@@ -51 +50 @@
 #include "qpointer.h"
 #include "qtimer.h"
+
 #include "qdebug.h"
 
@@ -104 +104 @@
     bool showWidget;
     QTimer anim;
-    QTime checkTime;
+    Q checkTime;
     double windowOpacity;
 };
@@ -385 +385 @@
 
     QTimer anim;
-    QTime checkTime;
+    Q checkTime;
 
     QPixmap pm;