diff options
| author | John Fultz <jfultz@wolfram.com> | 2017-08-01 23:20:55 -0500 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2017-08-02 00:27:47 -0500 |
| commit | 67059305e164f3b741c36d4e0ac22022c9b79901 (patch) | |
| tree | 7f9a62443c0283c58e4353fa38e41ef95bcf264a /quackleio | |
| parent | 6684280feec74fa4c58066cf8e667b5f19a717c7 (diff) | |
More Qt5 changes and cleanups.
Now builds on Qt 5.9.1, and works on Mac, Windows, Linux.
Diffstat (limited to 'quackleio')
| -rw-r--r-- | quackleio/gcgio.cpp | 2 | ||||
| -rw-r--r-- | quackleio/quackleio.pro | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/quackleio/gcgio.cpp b/quackleio/gcgio.cpp index b60d57c..76360ac 100644 --- a/quackleio/gcgio.cpp +++ b/quackleio/gcgio.cpp @@ -132,7 +132,7 @@ Quackle::Game *GCGIO::read(QTextStream &stream, int flags) else if (line.startsWith("#character-encoding")) { QString encoding{line.right(line.length() - 20).trimmed()}; - stream.setCodec(QTextCodec::codecForName(encoding.toAscii())); + stream.setCodec(QTextCodec::codecForName(encoding.toLatin1())); } } else if (line.startsWith(">")) diff --git a/quackleio/quackleio.pro b/quackleio/quackleio.pro index 9cff93c..bd46a01 100644 --- a/quackleio/quackleio.pro +++ b/quackleio/quackleio.pro @@ -28,12 +28,9 @@ HEADERS += *.h SOURCES += *.cpp -macx-g++ { - QMAKE_CXXFLAGS += -fpermissive -} - -macx-xcode { +macx { CONFIG += x86 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 } unix:!macx { |