aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>2011-12-29 00:21:28 +0000
committerubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>2011-12-29 00:21:28 +0000
commit22ddd56d112d9911c1f56e1db49ee76059755cf4 (patch)
treed474a60090dd3ded75ecc337b2f47f6215e0a0fa
parentalso show importdetaildialog when dropping key on keylist (diff)
downloadgpg4usb-22ddd56d112d9911c1f56e1db49ee76059755cf4.tar.gz
gpg4usb-22ddd56d112d9911c1f56e1db49ee76059755cf4.zip
fix helpbrowser for qt 4.8
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@715 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rw-r--r--helppage.cpp2
-rw-r--r--main.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/helppage.cpp b/helppage.cpp
index 381614b..88357b4 100644
--- a/helppage.cpp
+++ b/helppage.cpp
@@ -32,7 +32,7 @@ HelpPage::HelpPage(const QString path, QWidget *parent) :
mainLayout->setContentsMargins(0,0,0,0);
setLayout(mainLayout);
//setAttribute(Qt::WA_DeleteOnClose);
- browser->setSource(path);
+ browser->setSource(QUrl::fromLocalFile(path));
browser->setFocus();
}
diff --git a/main.cpp b/main.cpp
index 00ce713..aaf4e81 100644
--- a/main.cpp
+++ b/main.cpp
@@ -88,6 +88,10 @@ int main(int argc, char *argv[])
#endif
app.installTranslator(&translator2);
+ /*foreach(QLocale l , QLocale::matchingLocales(lang, "", "")) {
+ qDebug << "l: " << l.toString();
+ }*/
+
// css
QFile file(qApp->applicationDirPath() + "/css/default.css");
file.open(QFile::ReadOnly);