diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:45:38 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:46:19 +0200 |
commit | d671acd5b296b83440db9836a92189c501c87ff3 (patch) | |
tree | bd9c1a000e17c70124c207666cfb3276b5518ffd /tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data | |
parent | 42f5786104f9eef9542df2c7469a03324978281d (diff) | |
parent | 4f2138ecfbdc58e5cb5b0c7d762197ef69752957 (diff) |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/widgets/kernel/qwidget_qpa.cpp
tests/auto/qvariant/tst_qvariant.cpp
Diffstat (limited to 'tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data')
-rw-r--r-- | tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file |