diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-10-21 23:28:53 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-10-21 23:28:53 +0200 |
| commit | 8d8f29078b2e7fd07e8b21fe238a76f9eb134492 (patch) | |
| tree | 25c88c6e67541010d147a06fad2e3785102e171b /src/mainwindow.cpp | |
| parent | add comment to string (diff) | |
| download | rekonq-8d8f29078b2e7fd07e8b21fe238a76f9eb134492.tar.xz | |
This commit fixes icons handling for "rekonq pages" (eg: about urls).
It also contains a cleaned version of the WebTab::url() method (the previous one was
not working on loading pages. And also immediately after the loadFinished signal)
This should also fix some "bad" handling on back/forward buttons.
Finally, it contains some unrelated QLatin1String --> QL1S changes.
Benjamin, I spoke too early about those.
I squashed merged my work and removed previous branch :(
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 4d3dfc91..555e58ae 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1284,7 +1284,7 @@ void MainWindow::populateEncodingMenu() QList<int> mibs = QTextCodec::availableMibs(); Q_FOREACH (const int &mib, mibs) { - QString codec = QLatin1String(QTextCodec::codecForMib(mib)->name()); + QString codec = QL1S(QTextCodec::codecForMib(mib)->name()); codecs.append(codec); } codecs.sort(); |