Mercurial > octave
comparison libgui/src/main-window.cc @ 17674:dd125b5e8090
handle OCTAVE_HOME substitution for NEWS file (bug #40284)
* main-window.cc (main_window::display_release_notes): Use
Voct_etc_dir, which accounts for OCTAVE_HOME, instead of
OCTAVE_OCTETCDIR.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 17 Oct 2013 12:50:17 -0400 |
| parents | 516e1fa636ee |
| children | c060ad097056 |
comparison
equal
deleted
inserted
replaced
| 17673:9f6e4e5c2bac | 17674:dd125b5e8090 |
|---|---|
| 249 } | 249 } |
| 250 | 250 |
| 251 void | 251 void |
| 252 main_window::display_release_notes (void) | 252 main_window::display_release_notes (void) |
| 253 { | 253 { |
| 254 display_url_in_window (QUrl ("file://" OCTAVE_OCTETCDIR "/NEWS")); | 254 std::string news_file = "file://" + Voct_etc_dir + "/NEWS"; |
| 255 | |
| 256 display_url_in_window (QUrl (QString::fromStdString (news_file))); | |
| 255 } | 257 } |
| 256 | 258 |
| 257 void | 259 void |
| 258 main_window::display_url_in_window (const QUrl& url) | 260 main_window::display_url_in_window (const QUrl& url) |
| 259 { | 261 { |