Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 12:46:35 +01:00
Code Releases Activity

Edited windows installer, now installing msvc2008 redistributables.

Browse Source 
- QupZilla now should run correctly on every MS system
This commit is contained in:
nowrep 2012-01-17 21:20:09 +01:00
parent e5a06e8a8b
commit 7a9493a3b3
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/webview/webpage.cpp
View File

@ -210,17 +210,7 @@ bool WebPage::acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest &r
} }
} }
if (!frame && type != QWebPage::NavigationTypeOther) {
qDebug() << "coming from javascript";
}
// TabWidget::OpenUrlIn openIn= frame ? TabWidget::CurrentTab: TabWidget::NewTab;
bool accept = QWebPage::acceptNavigationRequest(frame, request, type); bool accept = QWebPage::acceptNavigationRequest(frame, request, type);
// if (accept && openIn == TabWidget::NewTab) {
// m_isOpeningNextWindowAsNewTab = true;
// p_QupZilla->tabWidget()->addView(request.url(),tr("New tab"), openIn);
// }
return accept; return accept;
} }
@ -247,7 +237,6 @@ QWebPage* WebPage::createWindow(QWebPage::WebWindowType type)
// view->show(); // view->show();
// return view->page(); // return view->page();
qDebug() << "createWindow";
Q_UNUSED(type); Q_UNUSED(type);
int index = p_QupZilla->tabWidget()->addView(QUrl(), tr("New tab"), TabWidget::CleanSelectedPage); int index = p_QupZilla->tabWidget()->addView(QUrl(), tr("New tab"), TabWidget::CleanSelectedPage);
return p_QupZilla->weView(index)->page(); return p_QupZilla->weView(index)->page();

24
windows/installer.nsi
View File

@ -92,6 +92,9 @@ Section !$(TITLE_SecMain) SecMain
File "codecs\qkrcodecs4.dll" File "codecs\qkrcodecs4.dll"
File "codecs\qtwcodecs4.dll" File "codecs\qtwcodecs4.dll"
SetOutPath "$INSTDIR\iconengines"
File "iconengines\qsvgicon4.dll"
SetOutPath "$INSTDIR\sqldrivers" SetOutPath "$INSTDIR\sqldrivers"
File "sqldrivers\qsqlite4.dll" File "sqldrivers\qsqlite4.dll"
@ -206,6 +209,14 @@ SectionGroup $(TITLE_SecTranslations) SecTranslations
File "locale\qt_pt.qm" File "locale\qt_pt.qm"
SectionEnd SectionEnd
Section "Serbian"
SetOutPath "$INSTDIR\locale"
File "locale\sr_BA.qm"
File "locale\sr_RS.qm"
File "locale\qt_sr_BA.qm"
File "locale\qt_sr_RS.qm"
SectionEnd
SectionGroupEnd SectionGroupEnd
SectionGroup $(TITLE_SecPlugins) SecPlugins SectionGroup $(TITLE_SecPlugins) SecPlugins
@ -215,14 +226,13 @@ SectionGroup $(TITLE_SecPlugins) SecPlugins
SectionEnd SectionEnd
SectionGroupEnd SectionGroupEnd
Section $(TITLE_SecExtensions) SecExtensions Section $(TITLE_SecExtensions) SecExtensions
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
${registerExtension} "$INSTDIR\qupzilla.exe" ".htm" $(FILE_Htm) ${registerExtension} "$INSTDIR\qupzilla.exe" ".htm" $(FILE_Htm)
${registerExtension} "$INSTDIR\qupzilla.exe" ".html" $(FILE_Html) ${registerExtension} "$INSTDIR\qupzilla.exe" ".html" $(FILE_Html)
SectionEnd SectionEnd
Section "-StartMenu" Section -StartMenu
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
SetShellVarContext all SetShellVarContext all
CreateDirectory "$SMPROGRAMS\QupZilla" CreateDirectory "$SMPROGRAMS\QupZilla"
@ -246,7 +256,7 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SecThemes} $(DESC_SecThemes) !insertmacro MUI_DESCRIPTION_TEXT ${SecThemes} $(DESC_SecThemes)
!insertmacro MUI_FUNCTION_DESCRIPTION_END !insertmacro MUI_FUNCTION_DESCRIPTION_END
Section "-Uninstaller" Section -Uninstaller
WriteUninstaller "$INSTDIR\uninstall.exe" WriteUninstaller "$INSTDIR\uninstall.exe"
WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\qupzilla.exe" WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\qupzilla.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
@ -255,6 +265,14 @@ Section "-Uninstaller"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
SectionEnd SectionEnd
Section -MSVC
InitPluginsDir
SetOutPath $PLUGINSDIR
File "wininstall\vcredist_x86.exe"
DetailPrint "Installing Visual C++ 2008 Libraries"
ExecWait '"$PLUGINSDIR\vcredist_x86.exe" /q:a /c:"msiexec /i vcredist.msi /quiet"'
SectionEnd
Section Uninstall Section Uninstall
KillProcDLL::KillProc "qupzilla.exe" KillProcDLL::KillProc "qupzilla.exe"
Sleep 100 Sleep 100