diff options
author | Tobias Sung <gnusuz@posteo.de> | 2017-03-31 17:08:50 +0200 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-03-31 20:29:35 +0000 |
commit | 507223a218aa218e80dd9eae9bd3958efda301cf (patch) | |
tree | f533b62a20c66e55eb5ce054d08bfd0e540a254f | |
parent | 88a8feeacb9bdaff9ee06164424e407eb904cd10 (diff) |
Don't use non-POD type as variadic argument
Implicit conversion from QByteArray to const char* works for most gtk
functions. But gtk_file_chooser_dialog_new() uses varargs and passing
the non-POD QByteArray through varargs does not work (it's UB).
Task-number: QTBUG-59763
Change-Id: I85f9323d99342896e6921cdeb85f5a1af7377b4f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
-rw-r--r-- | src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp index 8b6ec31400..eb7f0d8c2c 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp +++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp @@ -245,8 +245,8 @@ QGtk3FileDialogHelper::QGtk3FileDialogHelper() { d.reset(new QGtk3Dialog(gtk_file_chooser_dialog_new("", 0, GTK_FILE_CHOOSER_ACTION_OPEN, - standardButtonText(QPlatformDialogHelper::Cancel), GTK_RESPONSE_CANCEL, - standardButtonText(QPlatformDialogHelper::Ok), GTK_RESPONSE_OK, + standardButtonText(QPlatformDialogHelper::Cancel).constData(), GTK_RESPONSE_CANCEL, + standardButtonText(QPlatformDialogHelper::Ok).constData(), GTK_RESPONSE_OK, NULL))); connect(d.data(), SIGNAL(accept()), this, SLOT(onAccepted())); |