Changeset 846 for trunk/src/gui/widgets/qlineedit.h

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/qlineedit.h (modified) (3 diffs)

trunk/src/gui/widgets/qlineedit.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -84 +84 @@
     Q_PROPERTY(bool redoAvailable READ isRedoAvailable)
     Q_PROPERTY(bool acceptableInput READ hasAcceptableInput)
-// ### Qt 4.7: remove this #if guard
-#if (QT_VERSION >= 0x407000) || defined(Q_WS_MAEMO_5)
     Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText)
-#endif
 
 public:
@@ -103 +100 @@
     QString displayText() const;
 
-// ### Qt 4.7: remove this #if guard
-#if (QT_VERSION >= 0x407000) || defined(Q_WS_MAEMO_5)
     QString placeholderText() const;
     void setPlaceholderText(const QString &);
-#endif
 
     int maxLength() const;