diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-05-03 15:43:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 16:11:58 +0200 |
| commit | 6dac3f18941bd2d66218ec43f08e4fb9be869c63 (patch) | |
| tree | f2664c9f31d5046f38a1403f46eb0fc162d5242c /src/corelib/kernel/qvariant.h | |
| parent | b4dabb9e50ce26469b0b7d71e168463abf727334 (diff) | |
| parent | 1e49914fee099c4c0d634743326b50ad02e6c8f1 (diff) | |
Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index fb0e059f45..cd8ac9823d 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -248,7 +248,6 @@ class Q_CORE_EXPORT QVariant QVariant(const QUrl &url); QVariant(const QEasingCurve &easing); #endif - QVariant(Qt::GlobalColor color); QVariant& operator=(const QVariant &other); #ifdef Q_COMPILER_RVALUE_REFS |