Changeset 7a39458d16 in tspsg for src


Ignore:
Timestamp:
Sep 21, 2012, 11:22:42 PM (12 years ago)
Author:
Oleksii Serdiuk
Branches:
appveyor, imgbot, master, readme
Children:
07e43cf61a
Parents:
19d4eac43b
git-author:
Oleksii Serdiuk <contacts@…> (09/21/12 23:22:42)
git-committer:
Oleksii Serdiuk <contacts@…> (09/21/12 23:27:33)
Message:

A few more fixes for compatibility with Qt 5.

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp

    r19d4eac43b r7a39458d16  
    18071807    window \a flags.
    18081808*/
    1809 QtToolBarDialog::QtToolBarDialog(QWidget *parent, Qt::WFlags flags)
     1809QtToolBarDialog::QtToolBarDialog(QWidget *parent, Qt::WindowFlags flags)
    18101810    : QDialog(parent, flags)
    18111811{
  • src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.h

    r19d4eac43b r7a39458d16  
    115115public:
    116116
    117     QtToolBarDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
     117    QtToolBarDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
    118118    ~QtToolBarDialog();
    119119
  • src/mainwindow.cpp

    r19d4eac43b r7a39458d16  
    307307        QString format = settings->value("Output/GraphImageFormat", DEF_GRAPH_IMAGE_FORMAT).toString();
    308308#if !defined(NOSVG)
    309         if (!QImageWriter::supportedImageFormats().contains(format.toAscii()) && (format != "svg")) {
     309        if (!QImageWriter::supportedImageFormats().contains(format.toLatin1()) && (format != "svg")) {
    310310#else // NOSVG
    311         if (!QImageWriter::supportedImageFormats().contains(format.toAscii())) {
     311        if (!QImageWriter::supportedImageFormats().contains(format.toLatin1())) {
    312312#endif // NOSVG
    313313            format = DEF_GRAPH_IMAGE_FORMAT;
     
    13171317        QImageWriter pic;
    13181318        pic.setDevice(&buf);
    1319         pic.setFormat(format.toAscii());
     1319        pic.setFormat(format.toLatin1());
    13201320        if (pic.supportsOption(QImageIOHandler::Description)) {
    13211321            pic.setText("Title", "Solution Graph");
Note: See TracChangeset for help on using the changeset viewer.