diff options
| author | Darrell Anderson <[email protected]> | 2012-12-19 14:03:09 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-12-19 14:03:09 -0600 |
| commit | 35202ed0d899a9ff3c77dad72b501fb30e4dcf93 (patch) | |
| tree | 683787f69d937483b860973ce17f0c5d430a142d /src/kernel/qdragobject.cpp | |
| parent | 8d5add0e87ad913bdf0362a83f431995115f3bfa (diff) | |
| parent | f19aa203c934d0f85862fdf810a87fe7c5777d17 (diff) | |
| download | qt3-35202ed0d899a9ff3c77dad72b501fb30e4dcf93.tar.gz qt3-35202ed0d899a9ff3c77dad72b501fb30e4dcf93.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/kernel/qdragobject.cpp')
| -rw-r--r-- | src/kernel/qdragobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp index 4f3353b..d48d79f 100644 --- a/src/kernel/qdragobject.cpp +++ b/src/kernel/qdragobject.cpp @@ -1749,9 +1749,9 @@ QColorDrag::QColorDrag( QWidget *dragsource, const char *name ) void QColorDrag::setColor( const QColor &col ) { - short r = (col.red() << 8) | col.red(); - short g = (col.green() << 8) | col.green(); - short b = (col.blue() << 8) | col.blue(); + unsigned short r = (col.red() << 8) | col.red(); + unsigned short g = (col.green() << 8) | col.green(); + unsigned short b = (col.blue() << 8) | col.blue(); // make sure we transmit data in network order r = htons(r); |