Skip to content

Commit

Permalink
Qt: upgrade to Qt 5.9 LTS (closes #1311).
Browse files Browse the repository at this point in the history
  • Loading branch information
@agarny
agarny committed Jun 1, 2017
2 parents a488148 + c0fceed commit e9d9803
Show file tree
Hide file tree
Showing 21 changed files with 29 additions and 28 deletions.
4 changes: 2 additions & 2 deletions cmake/common.cmake
View file
Expand Up @@ -287,12 +287,12 @@ MACRO(INITIALISE_PROJECT)
ADD_DEFINITIONS(-DENABLE_TEST_PLUGINS)
ENDIF()

# On macOS, make sure that we support 10.8 and later, unless a specific
# On macOS, make sure that we support 10.10 and later, unless a specific
# deployment target has been specified

IF(APPLE)
IF("${CMAKE_OSX_DEPLOYMENT_TARGET}" STREQUAL "")
SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)
SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.10)
ENDIF()

IF(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "10.12")
Expand Down
8 changes: 4 additions & 4 deletions doc/developer/prerequisites.html
View file
Expand Up @@ -39,7 +39,7 @@
</ul>
</li>
<li>
<a href="https://www.qt.io/">Qt</a> 5.6.2 LTS: a cross-platform application and UI framework (<a href="https://www.qt.io/ide/">Qt Creator</a> 4.2.1 is its supporting IDE):
<a href="https://www.qt.io/">Qt</a> 5.9 LTS: a cross-platform application and UI framework (<a href="https://www.qt.io/ide/">Qt Creator</a> is its supporting IDE):

<ul>
<li><strong><a href="https://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe">Windows</a></strong> (64-bit);</li>
Expand All @@ -56,9 +56,9 @@
</p>

<ul>
<li><strong>Windows:</strong> <code>C:\Program Files\Git\bin</code>, <code>C:\Program Files\CMake\bin</code>, <code>C:\Qt\5.6\msvc2015_64\bin</code> and <code>C:\Qt\Tools\QtCreator\bin</code>;</li>
<li><strong>Linux:</strong> <code>/opt/Qt/5.6/gcc_64/bin</code> in <code>/etc/environment</code> on Ubuntu; and</li>
<li><strong>macOS:</strong> <code>/Applications/Qt/5.6/clang_64/bin</code> in <code>/etc/profile</code>.</li>
<li><strong>Windows:</strong> <code>C:\Program Files\Git\bin</code>, <code>C:\Program Files\CMake\bin</code>, <code>C:\Qt\5.9\msvc2015_64\bin</code> and <code>C:\Qt\Tools\QtCreator\bin</code>;</li>
<li><strong>Linux:</strong> <code>/opt/Qt/5.9/gcc_64/bin</code> in <code>/etc/environment</code> on Ubuntu; and</li>
<li><strong>macOS:</strong> <code>/Applications/Qt/5.9/clang_64/bin</code> in <code>/etc/profile</code>.</li>
</ul>

<p>
Expand Down
2 changes: 1 addition & 1 deletion doc/downloads/index.js
View file
Expand Up @@ -37,7 +37,7 @@ var jsonData = { "versions": [
}
],
"changes": [
{ "change": "<strong>General:</strong> OpenGL now works in an Ubuntu virtual machine (see issue <a href=\"https://github.com/opencor/opencor/issues/1307\">#1307</a>). Added OpenSSL as a third-party plugin (see issues <a href=\"https://github.com/opencor/opencor/issues/1101\">#1101</a> and <a href=\"https://github.com/opencor/opencor/issues/1314\">#1314</a>). Can now open remote binary files (see issue <a href=\"https://github.com/opencor/opencor/issues/1319\">#1319</a>)." }
{ "change": "<strong>General:</strong> OpenGL now works in an Ubuntu virtual machine (see issue <a href=\"https://github.com/opencor/opencor/issues/1307\">#1307</a>). Upgraded to Qt 5.9 LTS (see issue <a href=\"https://github.com/opencor/opencor/issues/1311\">#1311</a>). Added OpenSSL as a third-party plugin (see issues <a href=\"https://github.com/opencor/opencor/issues/1101\">#1101</a> and <a href=\"https://github.com/opencor/opencor/issues/1314\">#1314</a>). Can now open remote binary files (see issue <a href=\"https://github.com/opencor/opencor/issues/1319\">#1319</a>)." }
]
},
{ "major": 0, "minor": 4, "patch": 1, "day": 20, "month": 5, "year": 2015, "type": 0,
Expand Down
5 changes: 3 additions & 2 deletions doc/user/supportedPlatforms.html
View file
Expand Up @@ -29,7 +29,7 @@
<ul>
<li><strong>Up to OpenCOR 0.3:</strong> supported on both the 32-bit and 64-bit versions of <a href="https://en.wikipedia.org/wiki/Windows_XP">Windows XP</a> and later.</li>
<li><strong>OpenCOR 0.4.x:</strong> supported on both the 32-bit and 64-bit versions of <a href="https://en.wikipedia.org/wiki/Windows_7">Windows 7</a> and later.</li>
<li><strong>OpenCOR 0.5:</strong> supported on the 64-bit version of <a href="https://en.wikipedia.org/wiki/Windows_7">Windows 7</a> and later.</li>
<li><strong>OpenCOR 0.5 and snapshots:</strong> supported on the 64-bit version of <a href="https://en.wikipedia.org/wiki/Windows_7">Windows 7</a> and later.</li>
</ul>

<div class="section">
Expand All @@ -39,7 +39,7 @@
<ul>
<li><strong>OpenCOR 0.1.x and 0.2:</strong> supported on both the 32-bit and 64-bit versions of <a href="https://en.wikipedia.org/wiki/Ubuntu_(operating_system)">Ubuntu</a> 12.04 LTS (Precise Pangolin) and later.</li>
<li><strong>OpenCOR 0.3 and 0.4.x:</strong> supported on both the 32-bit and 64-bit versions of <a href="https://en.wikipedia.org/wiki/Ubuntu_(operating_system)">Ubuntu</a> 14.04 LTS (Trusty Tahr) and later.</li>
<li><strong>OpenCOR 0.5:</strong> supported on the 64-bit version of <a href="https://en.wikipedia.org/wiki/Ubuntu_(operating_system)">Ubuntu</a> 14.04 LTS (Trusty Tahr) and later.</li>
<li><strong>OpenCOR 0.5 and snapshots:</strong> supported on the 64-bit version of <a href="https://en.wikipedia.org/wiki/Ubuntu_(operating_system)">Ubuntu</a> 14.04 LTS (Trusty Tahr) and later.</li>
</ul>

<div class="section">
Expand All @@ -50,6 +50,7 @@
<li><strong>OpenCOR 0.1.x:</strong> supported on <a href="https://en.wikipedia.org/wiki/OS_X_Mountain_Lion">OS X 10.8</a> (Mountain Lion) and later.</li>
<li><strong>OpenCOR 0.2 to 0.4.x:</strong> supported on <a href="https://en.wikipedia.org/wiki/Mac_OS_X_Lion">Mac OS X 10.7</a> (Lion) and later.</li>
<li><strong>OpenCOR 0.5:</strong> supported on <a href="https://en.wikipedia.org/wiki/OS_X_Mountain_Lion">OS X 10.8</a> (Mountain Lion) and later.</li>
<li><strong>Snapshots:</strong> supported on <a href="https://en.wikipedia.org/wiki/OS_X_Yosemite">OS X 10.10</a> (Mountain Lion) and later.</li>
</ul>

<script type="text/javascript">
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewcellmllistwidget.cpp
View file
Expand Up @@ -1020,7 +1020,7 @@ void CellmlAnnotationViewCellmlListWidget::indexExpandAll(const QModelIndex &pIn
// a call to expand() is quite expensive, so the fewer of those we
// make the better...

if (pIndex.child(0, 0).isValid()) {
if (pIndex.model()->index(0, 0, pIndex).isValid()) {
mTreeViewWidget->expand(pIndex);

QStandardItem *item = mTreeViewModel->itemFromIndex(pIndex);
Expand All @@ -1037,7 +1037,7 @@ void CellmlAnnotationViewCellmlListWidget::indexCollapseAll(const QModelIndex &p
// Recursively collapse all the CellML elements below the current one
// Note: see the note in indexExpandAll() above...

if (pIndex.child(0, 0).isValid()) {
if (pIndex.model()->index(0, 0, pIndex).isValid()) {
QStandardItem *item = mTreeViewModel->itemFromIndex(pIndex);

for (int i = 0, iMax = item->rowCount(); i < iMax; ++i)
Expand All @@ -1055,7 +1055,7 @@ bool CellmlAnnotationViewCellmlListWidget::indexIsAllExpanded(const QModelIndex
// are expanded
// Note: see the note in indexExpandAll() above...

if (pIndex.child(0, 0).isValid()) {
if (pIndex.model()->index(0, 0, pIndex).isValid()) {
QStandardItem *item = mTreeViewModel->itemFromIndex(pIndex);

for (int i = 0, iMax = item->rowCount(); i < iMax; ++i)
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/miscellaneous/Core/src/treeviewwidget.cpp
View file
Expand Up @@ -175,7 +175,7 @@ void TreeViewWidget::keyPressEvent(QKeyEvent *pEvent)
} else {
// The current item is expanded, so select its first child

setCurrentIndex(crtIndex.child(0, 0));
setCurrentIndex(crtIndex.model()->index(0, 0, crtIndex));

// Accept the event

Expand Down
2 changes: 1 addition & 1 deletion ...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp
View file
Expand Up @@ -800,7 +800,7 @@ void SimulationExperimentViewSimulationWidget::initialize(const bool &pReloading
QString additionalInformation = QString();

if (cellmlFileRuntime->needNlaSolver())
additionalInformation = " + "+tr("NLA system(s)");
additionalInformation = "+"+tr("NLA system(s)");

information += "<span"+OutputGood+">"+tr("valid")+"</span>."+OutputBrLn;
information += QString(OutputTab+"<strong>"+tr("Model type:")+"</strong> <span"+OutputInfo+">%1%2</span>."+OutputBrLn).arg((cellmlFileRuntime->modelType() == CellMLSupport::CellmlFileRuntime::Ode)?tr("ODE"):tr("DAE"),
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_barchart.h
View file
Expand Up @@ -67,7 +67,7 @@ class QWT_EXPORT QwtPlotBarChart:
LegendBarTitles
};

explicit QwtPlotBarChart( const QString &title = QString::null );
explicit QwtPlotBarChart( const QString &title = QString() );
explicit QwtPlotBarChart( const QwtText &title );

virtual ~QwtPlotBarChart();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_curve.h
View file
Expand Up @@ -210,7 +210,7 @@ class QWT_EXPORT QwtPlotCurve:
//! Paint attributes
typedef QFlags<PaintAttribute> PaintAttributes;

explicit QwtPlotCurve( const QString &title = QString::null );
explicit QwtPlotCurve( const QString &title = QString() );
explicit QwtPlotCurve( const QwtText &title );

virtual ~QwtPlotCurve();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_histogram.h
View file
Expand Up @@ -76,7 +76,7 @@ class QWT_EXPORT QwtPlotHistogram:
UserStyle = 100
};

explicit QwtPlotHistogram( const QString &title = QString::null );
explicit QwtPlotHistogram( const QString &title = QString() );
explicit QwtPlotHistogram( const QwtText &title );
virtual ~QwtPlotHistogram();

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_intervalcurve.h
View file
Expand Up @@ -76,7 +76,7 @@ class QWT_EXPORT QwtPlotIntervalCurve:
//! Paint attributes
typedef QFlags<PaintAttribute> PaintAttributes;

explicit QwtPlotIntervalCurve( const QString &title = QString::null );
explicit QwtPlotIntervalCurve( const QString &title = QString() );
explicit QwtPlotIntervalCurve( const QwtText &title );

virtual ~QwtPlotIntervalCurve();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_marker.h
View file
Expand Up @@ -68,7 +68,7 @@ class QWT_EXPORT QwtPlotMarker: public QwtPlotItem
Cross
};

explicit QwtPlotMarker( const QString &title = QString::null );
explicit QwtPlotMarker( const QString &title = QString() );
explicit QwtPlotMarker( const QwtText &title );

virtual ~QwtPlotMarker();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_multi_barchart.h
View file
Expand Up @@ -61,7 +61,7 @@ class QWT_EXPORT QwtPlotMultiBarChart:
Stacked
};

explicit QwtPlotMultiBarChart( const QString &title = QString::null );
explicit QwtPlotMultiBarChart( const QString &title = QString() );
explicit QwtPlotMultiBarChart( const QwtText &title );

virtual ~QwtPlotMultiBarChart();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_rasteritem.h
View file
Expand Up @@ -83,7 +83,7 @@ class QWT_EXPORT QwtPlotRasterItem: public QwtPlotItem
//! Paint attributes
typedef QFlags<PaintAttribute> PaintAttributes;

explicit QwtPlotRasterItem( const QString& title = QString::null );
explicit QwtPlotRasterItem( const QString& title = QString() );
explicit QwtPlotRasterItem( const QwtText& title );
virtual ~QwtPlotRasterItem();

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_seriesitem.h
View file
Expand Up @@ -23,7 +23,7 @@ class QWT_EXPORT QwtPlotSeriesItem: public QwtPlotItem,
public virtual QwtAbstractSeriesStore
{
public:
explicit QwtPlotSeriesItem( const QString &title = QString::null );
explicit QwtPlotSeriesItem( const QString &title = QString() );
explicit QwtPlotSeriesItem( const QwtText &title );

virtual ~QwtPlotSeriesItem();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_shapeitem.h
View file
Expand Up @@ -64,7 +64,7 @@ class QWT_EXPORT QwtPlotShapeItem: public QwtPlotItem
LegendColor
};

explicit QwtPlotShapeItem( const QString &title = QString::null );
explicit QwtPlotShapeItem( const QString &title = QString() );
explicit QwtPlotShapeItem( const QwtText &title );

virtual ~QwtPlotShapeItem();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_spectrocurve.h
View file
Expand Up @@ -35,7 +35,7 @@ class QWT_EXPORT QwtPlotSpectroCurve:
//! Paint attributes
typedef QFlags<PaintAttribute> PaintAttributes;

explicit QwtPlotSpectroCurve( const QString &title = QString::null );
explicit QwtPlotSpectroCurve( const QString &title = QString() );
explicit QwtPlotSpectroCurve( const QwtText &title );

virtual ~QwtPlotSpectroCurve();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_spectrogram.h
View file
Expand Up @@ -55,7 +55,7 @@ class QWT_EXPORT QwtPlotSpectrogram: public QwtPlotRasterItem
//! Display modes
typedef QFlags<DisplayMode> DisplayModes;

explicit QwtPlotSpectrogram( const QString &title = QString::null );
explicit QwtPlotSpectrogram( const QString &title = QString() );
virtual ~QwtPlotSpectrogram();

void setDisplayMode( DisplayMode, bool on = true );
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_svgitem.h
View file
Expand Up @@ -27,7 +27,7 @@ class QByteArray;
class QWT_EXPORT QwtPlotSvgItem: public QwtPlotItem
{
public:
explicit QwtPlotSvgItem( const QString& title = QString::null );
explicit QwtPlotSvgItem( const QString& title = QString() );
explicit QwtPlotSvgItem( const QwtText& title );
virtual ~QwtPlotSvgItem();

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_plot_tradingcurve.h
View file
Expand Up @@ -101,7 +101,7 @@ class QWT_EXPORT QwtPlotTradingCurve:
//! Paint attributes
typedef QFlags<PaintAttribute> PaintAttributes;

explicit QwtPlotTradingCurve( const QString &title = QString::null );
explicit QwtPlotTradingCurve( const QString &title = QString() );
explicit QwtPlotTradingCurve( const QwtText &title );

virtual ~QwtPlotTradingCurve();
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/Qwt/src/qwt_text.h
View file
Expand Up @@ -139,7 +139,7 @@ class QWT_EXPORT QwtText
//! Layout attributes
typedef QFlags<LayoutAttribute> LayoutAttributes;

QwtText( const QString & = QString::null,
QwtText( const QString & = QString(),
TextFormat textFormat = AutoText );
QwtText( const QwtText & );
~QwtText();
Expand Down

0 comments on commit e9d9803

Please sign in to comment.