summaryrefslogtreecommitdiffstats
path: root/src/controllers/bulk/bulkcontroller.cpp
diff options
context:
space:
mode:
authorRJ Skerry-Ryan <rryan@mixxx.org>2018-09-15 12:05:46 -0700
committerRJ Skerry-Ryan <rryan@mixxx.org>2018-09-15 12:35:32 -0700
commit1b6d50041a534f844747afb5b4eff7a92d28fc5b (patch)
tree5f143d6e1374ad99ee6d1aa2ab9b8bbd6a4aeebb /src/controllers/bulk/bulkcontroller.cpp
parent8eb2539abb1c9da1e4d02bcf188b54ab23e87b71 (diff)
Remove QT_DISABLE_DEPRECATED_BEFORE and fix all Qt 5 compatibility issues.
Diffstat (limited to 'src/controllers/bulk/bulkcontroller.cpp')
-rw-r--r--src/controllers/bulk/bulkcontroller.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp
index e3f4b1a525..bc4e0cf187 100644
--- a/src/controllers/bulk/bulkcontroller.cpp
+++ b/src/controllers/bulk/bulkcontroller.cpp
@@ -66,7 +66,7 @@ static QString get_string(libusb_device_handle *handle, u_int8_t id) {
libusb_get_string_descriptor_ascii(handle, id, buf, sizeof(buf));
}
- return QString::fromAscii((char*)buf);
+ return QString::fromLatin1((char*)buf);
}