diff --git a/BUILDING b/BUILDING index 1c71507bd..45141dc9e 100644 --- a/BUILDING +++ b/BUILDING @@ -22,11 +22,12 @@ Building plugins ---------------------------------------------------------------------------------- To build plugins, it is neccessary to build QupZilla as static library first. - You will do this by running this command + You can do this by running this command qmake CONFIG+=build_plugins - and then build the whole project. + and then build the project. + You will now have the libqupzilla.a static library that you need to link to plugins. Microsoft Windows ---------------------------------------------------------------------------------- diff --git a/QupZilla.pro b/QupZilla.pro index 7cf8398a6..220a53531 100644 --- a/QupZilla.pro +++ b/QupZilla.pro @@ -11,9 +11,5 @@ lessThan(QT_VERSION, 4.7) { } TEMPLATE = subdirs - -build_plugins { - SUBDIRS += plugins -} - -SUBDIRS += src +SUBDIRS = src +build_plugins: SUBDIRS += plugins diff --git a/plugins/libqupzilla/libqupzilla.pro b/plugins/libqupzilla/libqupzilla.pro index f167ff1b6..099f3e488 100644 --- a/plugins/libqupzilla/libqupzilla.pro +++ b/plugins/libqupzilla/libqupzilla.pro @@ -1,5 +1,6 @@ include(../../src/3rdparty/qtsingleapplication.pri) include(../../defines.pri) +include(../../install.pri) include(../../src/src.pri) QT += core gui webkit sql network script @@ -11,5 +12,6 @@ CONFIG -= shared CONFIG += static DESTDIR = $$PWD +OBJECTS_DIR = $$PWD/build RESOURCES = win32|os2:RC_FILE = diff --git a/plugins/plugins.pro b/plugins/plugins.pro index 8a2ff085d..6ff22166f 100644 --- a/plugins/plugins.pro +++ b/plugins/plugins.pro @@ -1,2 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = libqupzilla TestPlugin + +sub_lib.subdir = libqupzilla +sub_testplugin.subdir = TestPlugin +sub_testplugin.depends = sub_lib + +SUBDIRS = sub_lib sub_testplugin diff --git a/src/src.pri b/src/src.pri index 1836f4f49..9ecb8e2e4 100644 --- a/src/src.pri +++ b/src/src.pri @@ -1,3 +1,4 @@ +DEPENDPATH = $$PWD INCLUDEPATH += $$PWD/3rdparty\ $$PWD/app\ $$PWD/autofill\ @@ -22,319 +23,319 @@ INCLUDEPATH += $$PWD/3rdparty\ $$PWD/bookmarksimport\ $$PWD/popupwindow\ -SOURCES += $$PWD/main.cpp\ - $$PWD/3rdparty/qtwin.cpp \ - $$PWD/3rdparty/lineedit.cpp \ - $$PWD/app/qupzilla.cpp \ - $$PWD/app/mainapplication.cpp \ - $$PWD/app/autosaver.cpp \ - $$PWD/autofill/autofillmodel.cpp \ - $$PWD/preferences/autofillmanager.cpp \ - $$PWD/bookmarks/bookmarkstoolbar.cpp \ - $$PWD/bookmarks/bookmarksmanager.cpp \ - $$PWD/cookies/cookiemanager.cpp \ - $$PWD/cookies/cookiejar.cpp \ - $$PWD/downloads/downloadmanager.cpp \ - $$PWD/history/historymodel.cpp \ - $$PWD/history/historymanager.cpp \ - $$PWD/navigation/websearchbar.cpp \ - $$PWD/navigation/locationcompleter.cpp \ - $$PWD/navigation/locationbar.cpp \ - $$PWD/network/networkmanagerproxy.cpp \ - $$PWD/network/networkmanager.cpp \ - $$PWD/other/updater.cpp \ - $$PWD/other/sourceviewer.cpp \ - $$PWD/preferences/preferences.cpp \ - $$PWD/rss/rssmanager.cpp \ - $$PWD/other/clearprivatedata.cpp \ - $$PWD/webview/webpage.cpp \ - $$PWD/webview/tabwidget.cpp \ - $$PWD/webview/tabbar.cpp \ - $$PWD/webview/siteinfo.cpp \ - $$PWD/webview/searchtoolbar.cpp \ - $$PWD/app/commandlineoptions.cpp \ - $$PWD/other/aboutdialog.cpp \ - $$PWD/plugins/plugins.cpp \ - $$PWD/preferences/pluginslist.cpp \ - $$PWD/plugins/pluginproxy.cpp \ - $$PWD/tools/clickablelabel.cpp \ - $$PWD/downloads/downloadoptionsdialog.cpp \ - $$PWD/tools/treewidget.cpp \ - $$PWD/bookmarks/bookmarkswidget.cpp \ - $$PWD/tools/frame.cpp \ - $$PWD/bookmarks/bookmarksmodel.cpp \ - $$PWD/sidebar/sidebar.cpp \ - $$PWD/webview/siteinfowidget.cpp \ - $$PWD/plugins/clicktoflash.cpp \ - $$PWD/plugins/webpluginfactory.cpp \ - $$PWD/downloads/downloaditem.cpp \ - $$PWD/3rdparty/ecwin7.cpp \ - $$PWD/webview/webtab.cpp \ - $$PWD/rss/rsswidget.cpp \ - $$PWD/autofill/autofillnotification.cpp \ - $$PWD/rss/rssnotification.cpp \ - $$PWD/navigation/locationpopup.cpp \ - $$PWD/preferences/sslmanager.cpp \ - $$PWD/tools/animatedwidget.cpp \ - $$PWD/tools/htmlhighlighter.cpp \ - $$PWD/other/sourceviewersearch.cpp \ - $$PWD/adblock/adblocksubscription.cpp \ - $$PWD/adblock/adblockrule.cpp \ - $$PWD/adblock/adblockpage.cpp \ - $$PWD/adblock/adblocknetwork.cpp \ - $$PWD/adblock/adblockmanager.cpp \ - $$PWD/adblock/adblockdialog.cpp \ - $$PWD/adblock/adblockblockednetworkreply.cpp \ - $$PWD/adblock/adblockicon.cpp \ - $$PWD/tools/docktitlebarwidget.cpp \ - $$PWD/sidebar/bookmarkssidebar.cpp \ - $$PWD/bookmarks/bookmarkicon.cpp \ - $$PWD/sidebar/historysidebar.cpp \ - $$PWD/desktopnotifications/desktopnotification.cpp \ - $$PWD/desktopnotifications/desktopnotificationsfactory.cpp \ - $$PWD/tools/progressbar.cpp \ - $$PWD/tools/iconprovider.cpp \ - $$PWD/network/networkproxyfactory.cpp \ - $$PWD/tools/closedtabsmanager.cpp \ - $$PWD/other/statusbarmessage.cpp \ - $$PWD/tools/buttonbox.cpp \ - $$PWD/tools/widget.cpp \ - $$PWD/3rdparty/squeezelabelv2.cpp \ - $$PWD/3rdparty/squeezelabelv1.cpp \ - $$PWD/tools/buttonwithmenu.cpp \ - $$PWD/navigation/locationbarsettings.cpp \ - $$PWD/other/browsinglibrary.cpp \ - $$PWD/3rdparty/stylehelper.cpp \ - $$PWD/3rdparty/fancytabwidget.cpp \ - $$PWD/history/webhistoryinterface.cpp \ - $$PWD/tools/toolbutton.cpp \ - $$PWD/navigation/navigationbar.cpp \ - $$PWD/navigation/reloadstopbutton.cpp \ - $$PWD/preferences/thememanager.cpp \ - $$PWD/network/qupzillaschemehandler.cpp \ - $$PWD/tools/globalfunctions.cpp \ - $$PWD/other/pagescreen.cpp \ - $$PWD/downloads/downloadfilehelper.cpp \ - $$PWD/tools/certificateinfowidget.cpp \ - $$PWD/webview/webinspectordockwidget.cpp \ - $$PWD/app/profileupdater.cpp \ - $$PWD/preferences/acceptlanguage.cpp \ - $$PWD/opensearch/opensearchreader.cpp \ - $$PWD/opensearch/opensearchengine.cpp \ - $$PWD/opensearch/opensearchenginedelegate.cpp \ - $$PWD/opensearch/searchenginesmanager.cpp \ - $$PWD/opensearch/searchenginesdialog.cpp \ - $$PWD/opensearch/editsearchengine.cpp \ - $$PWD/bookmarksimport/firefoximporter.cpp \ - $$PWD/bookmarksimport/chromeimporter.cpp \ - $$PWD/bookmarksimport/operaimporter.cpp \ - $$PWD/bookmarksimport/bookmarksimportdialog.cpp \ - $$PWD/tools/iconfetcher.cpp \ - $$PWD/tools/followredirectreply.cpp \ - $$PWD/webview/webhistorywrapper.cpp \ - $$PWD/tools/pagethumbnailer.cpp \ - $$PWD/plugins/speeddial.cpp \ - $$PWD/other/databasewriter.cpp \ - $$PWD/bookmarksimport/htmlimporter.cpp \ - $$PWD/tools/enhancedmenu.cpp \ - $$PWD/navigation/siteicon.cpp \ - $$PWD/navigation/goicon.cpp \ - $$PWD/rss/rssicon.cpp \ - $$PWD/navigation/downicon.cpp \ - $$PWD/network/cabundleupdater.cpp \ - $$PWD/app/settings.cpp \ - $$PWD/app/proxystyle.cpp \ - $$PWD/popupwindow/popupwebpage.cpp \ - $$PWD/webview/popupwebview.cpp \ - $$PWD/popupwindow/popupwindow.cpp \ - $$PWD/popupwindow/popuplocationbar.cpp \ - $$PWD/webview/tabbedwebview.cpp \ - $$PWD/webview/webview.cpp \ - $$PWD/webview/webviewsettings.cpp +SOURCES += main.cpp\ + 3rdparty/qtwin.cpp \ + 3rdparty/lineedit.cpp \ + app/qupzilla.cpp \ + app/mainapplication.cpp \ + app/autosaver.cpp \ + autofill/autofillmodel.cpp \ + preferences/autofillmanager.cpp \ + bookmarks/bookmarkstoolbar.cpp \ + bookmarks/bookmarksmanager.cpp \ + cookies/cookiemanager.cpp \ + cookies/cookiejar.cpp \ + downloads/downloadmanager.cpp \ + history/historymodel.cpp \ + history/historymanager.cpp \ + navigation/websearchbar.cpp \ + navigation/locationcompleter.cpp \ + navigation/locationbar.cpp \ + network/networkmanagerproxy.cpp \ + network/networkmanager.cpp \ + other/updater.cpp \ + other/sourceviewer.cpp \ + preferences/preferences.cpp \ + rss/rssmanager.cpp \ + other/clearprivatedata.cpp \ + webview/webpage.cpp \ + webview/tabwidget.cpp \ + webview/tabbar.cpp \ + webview/siteinfo.cpp \ + webview/searchtoolbar.cpp \ + app/commandlineoptions.cpp \ + other/aboutdialog.cpp \ + plugins/plugins.cpp \ + preferences/pluginslist.cpp \ + plugins/pluginproxy.cpp \ + tools/clickablelabel.cpp \ + downloads/downloadoptionsdialog.cpp \ + tools/treewidget.cpp \ + bookmarks/bookmarkswidget.cpp \ + tools/frame.cpp \ + bookmarks/bookmarksmodel.cpp \ + sidebar/sidebar.cpp \ + webview/siteinfowidget.cpp \ + plugins/clicktoflash.cpp \ + plugins/webpluginfactory.cpp \ + downloads/downloaditem.cpp \ + 3rdparty/ecwin7.cpp \ + webview/webtab.cpp \ + rss/rsswidget.cpp \ + autofill/autofillnotification.cpp \ + rss/rssnotification.cpp \ + navigation/locationpopup.cpp \ + preferences/sslmanager.cpp \ + tools/animatedwidget.cpp \ + tools/htmlhighlighter.cpp \ + other/sourceviewersearch.cpp \ + adblock/adblocksubscription.cpp \ + adblock/adblockrule.cpp \ + adblock/adblockpage.cpp \ + adblock/adblocknetwork.cpp \ + adblock/adblockmanager.cpp \ + adblock/adblockdialog.cpp \ + adblock/adblockblockednetworkreply.cpp \ + adblock/adblockicon.cpp \ + tools/docktitlebarwidget.cpp \ + sidebar/bookmarkssidebar.cpp \ + bookmarks/bookmarkicon.cpp \ + sidebar/historysidebar.cpp \ + desktopnotifications/desktopnotification.cpp \ + desktopnotifications/desktopnotificationsfactory.cpp \ + tools/progressbar.cpp \ + tools/iconprovider.cpp \ + network/networkproxyfactory.cpp \ + tools/closedtabsmanager.cpp \ + other/statusbarmessage.cpp \ + tools/buttonbox.cpp \ + tools/widget.cpp \ + 3rdparty/squeezelabelv2.cpp \ + 3rdparty/squeezelabelv1.cpp \ + tools/buttonwithmenu.cpp \ + navigation/locationbarsettings.cpp \ + other/browsinglibrary.cpp \ + 3rdparty/stylehelper.cpp \ + 3rdparty/fancytabwidget.cpp \ + history/webhistoryinterface.cpp \ + tools/toolbutton.cpp \ + navigation/navigationbar.cpp \ + navigation/reloadstopbutton.cpp \ + preferences/thememanager.cpp \ + network/qupzillaschemehandler.cpp \ + tools/globalfunctions.cpp \ + other/pagescreen.cpp \ + downloads/downloadfilehelper.cpp \ + tools/certificateinfowidget.cpp \ + webview/webinspectordockwidget.cpp \ + app/profileupdater.cpp \ + preferences/acceptlanguage.cpp \ + opensearch/opensearchreader.cpp \ + opensearch/opensearchengine.cpp \ + opensearch/opensearchenginedelegate.cpp \ + opensearch/searchenginesmanager.cpp \ + opensearch/searchenginesdialog.cpp \ + opensearch/editsearchengine.cpp \ + bookmarksimport/firefoximporter.cpp \ + bookmarksimport/chromeimporter.cpp \ + bookmarksimport/operaimporter.cpp \ + bookmarksimport/bookmarksimportdialog.cpp \ + tools/iconfetcher.cpp \ + tools/followredirectreply.cpp \ + webview/webhistorywrapper.cpp \ + tools/pagethumbnailer.cpp \ + plugins/speeddial.cpp \ + other/databasewriter.cpp \ + bookmarksimport/htmlimporter.cpp \ + tools/enhancedmenu.cpp \ + navigation/siteicon.cpp \ + navigation/goicon.cpp \ + rss/rssicon.cpp \ + navigation/downicon.cpp \ + network/cabundleupdater.cpp \ + app/settings.cpp \ + app/proxystyle.cpp \ + popupwindow/popupwebpage.cpp \ + webview/popupwebview.cpp \ + popupwindow/popupwindow.cpp \ + popupwindow/popuplocationbar.cpp \ + webview/tabbedwebview.cpp \ + webview/webview.cpp \ + webview/webviewsettings.cpp HEADERS += \ - $$PWD/3rdparty/qtwin.h \ - $$PWD/3rdparty/lineedit.h \ - $$PWD/app/qupzilla.h \ - $$PWD/app/mainapplication.h \ - $$PWD/app/autosaver.h \ - $$PWD/autofill/autofillmodel.h \ - $$PWD/preferences/autofillmanager.h \ - $$PWD/bookmarks/bookmarkstoolbar.h \ - $$PWD/bookmarks/bookmarksmanager.h \ - $$PWD/cookies/cookiemanager.h \ - $$PWD/cookies/cookiejar.h \ - $$PWD/downloads/downloadmanager.h \ - $$PWD/history/historymodel.h \ - $$PWD/history/historymanager.h \ - $$PWD/navigation/websearchbar.h \ - $$PWD/navigation/locationcompleter.h \ - $$PWD/navigation/locationbar.h \ - $$PWD/network/networkmanagerproxy.h \ - $$PWD/network/networkmanager.h \ - $$PWD/other/updater.h \ - $$PWD/other/sourceviewer.h \ - $$PWD/preferences/preferences.h \ - $$PWD/rss/rssmanager.h \ - $$PWD/other/clearprivatedata.h \ - $$PWD/webview/webpage.h \ - $$PWD/webview/tabwidget.h \ - $$PWD/webview/tabbar.h \ - $$PWD/webview/siteinfo.h \ - $$PWD/webview/searchtoolbar.h \ - $$PWD/app/commandlineoptions.h \ - $$PWD/other/aboutdialog.h \ - $$PWD/plugins/plugininterface.h \ - $$PWD/plugins/plugins.h \ - $$PWD/preferences/pluginslist.h \ - $$PWD/plugins/pluginproxy.h \ - $$PWD/tools/clickablelabel.h \ - $$PWD/downloads/downloadoptionsdialog.h \ - $$PWD/tools/treewidget.h \ - $$PWD/bookmarks/bookmarkswidget.h \ - $$PWD/tools/frame.h \ - $$PWD/bookmarks/bookmarksmodel.h \ - $$PWD/sidebar/sidebar.h \ - $$PWD/webview/siteinfowidget.h \ - $$PWD/plugins/clicktoflash.h \ - $$PWD/plugins/webpluginfactory.h \ - $$PWD/downloads/downloaditem.h \ - $$PWD/3rdparty/ecwin7.h \ - $$PWD/webview/webtab.h \ - $$PWD/rss/rsswidget.h \ - $$PWD/autofill/autofillnotification.h \ - $$PWD/rss/rssnotification.h \ - $$PWD/navigation/locationpopup.h \ - $$PWD/preferences/sslmanager.h \ - $$PWD/tools/animatedwidget.h \ - $$PWD/tools/htmlhighlighter.h \ - $$PWD/other/sourceviewersearch.h \ - $$PWD/adblock/adblocksubscription.h \ - $$PWD/adblock/adblockrule.h \ - $$PWD/adblock/adblockpage.h \ - $$PWD/adblock/adblocknetwork.h \ - $$PWD/adblock/adblockmanager.h \ - $$PWD/adblock/adblockdialog.h \ - $$PWD/adblock/adblockblockednetworkreply.h \ - $$PWD/adblock/adblockicon.h \ - $$PWD/tools/docktitlebarwidget.h \ - $$PWD/sidebar/bookmarkssidebar.h \ - $$PWD/bookmarks/bookmarkicon.h \ - $$PWD/sidebar/historysidebar.h \ - $$PWD/desktopnotifications/desktopnotification.h \ - $$PWD/desktopnotifications/desktopnotificationsfactory.h \ - $$PWD/tools/progressbar.h \ - $$PWD/tools/iconprovider.h \ - $$PWD/network/networkproxyfactory.h \ - $$PWD/tools/closedtabsmanager.h \ - $$PWD/other/statusbarmessage.h \ - $$PWD/tools/buttonbox.h \ - $$PWD/tools/widget.h \ - $$PWD/3rdparty/squeezelabelv2.h \ - $$PWD/3rdparty/squeezelabelv1.h \ - $$PWD/tools/buttonwithmenu.h \ - $$PWD/navigation/locationbarsettings.h \ - $$PWD/other/browsinglibrary.h \ - $$PWD/3rdparty/stylehelper.h \ - $$PWD/3rdparty/fancytabwidget.h \ - $$PWD/history/webhistoryinterface.h \ - $$PWD/tools/toolbutton.h \ - $$PWD/navigation/navigationbar.h \ - $$PWD/navigation/reloadstopbutton.h \ - $$PWD/preferences/thememanager.h \ - $$PWD/network/qupzillaschemehandler.h \ - $$PWD/tools/globalfunctions.h \ - $$PWD/other/pagescreen.h \ - $$PWD/downloads/downloadfilehelper.h \ - $$PWD/tools/certificateinfowidget.h \ - $$PWD/webview/webinspectordockwidget.h \ - $$PWD/3rdparty/msvc2008.h \ - $$PWD/app/profileupdater.h \ - $$PWD/preferences/acceptlanguage.h \ - $$PWD/opensearch/opensearchreader.h \ - $$PWD/opensearch/opensearchengine.h \ - $$PWD/opensearch/opensearchenginedelegate.h \ - $$PWD/opensearch/searchenginesmanager.h \ - $$PWD/opensearch/searchenginesdialog.h \ - $$PWD/opensearch/editsearchengine.h \ - $$PWD/bookmarksimport/firefoximporter.h \ - $$PWD/bookmarksimport/chromeimporter.h \ - $$PWD/bookmarksimport/operaimporter.h \ - $$PWD/bookmarksimport/bookmarksimportdialog.h \ - $$PWD/tools/iconfetcher.h \ - $$PWD/tools/followredirectreply.h \ - $$PWD/webview/webhistorywrapper.h \ - $$PWD/tools/pagethumbnailer.h \ - $$PWD/plugins/speeddial.h \ - $$PWD/other/databasewriter.h \ - $$PWD/bookmarksimport/htmlimporter.h \ - $$PWD/tools/enhancedmenu.h \ - $$PWD/navigation/siteicon.h \ - $$PWD/navigation/goicon.h \ - $$PWD/rss/rssicon.h \ - $$PWD/navigation/downicon.h \ - $$PWD/network/cabundleupdater.h \ - $$PWD/app/settings.h \ - $$PWD/app/proxystyle.h \ - $$PWD/popupwindow/popupwebpage.h \ - $$PWD/webview/popupwebview.h \ - $$PWD/popupwindow/popupwindow.h \ - $$PWD/popupwindow/popuplocationbar.h \ - $$PWD/webview/tabbedwebview.h \ - $$PWD/webview/webview.h \ - $$PWD/app/qz_namespace.h \ - $$PWD/webview/webviewsettings.h + 3rdparty/qtwin.h \ + 3rdparty/lineedit.h \ + app/qupzilla.h \ + app/mainapplication.h \ + app/autosaver.h \ + autofill/autofillmodel.h \ + preferences/autofillmanager.h \ + bookmarks/bookmarkstoolbar.h \ + bookmarks/bookmarksmanager.h \ + cookies/cookiemanager.h \ + cookies/cookiejar.h \ + downloads/downloadmanager.h \ + history/historymodel.h \ + history/historymanager.h \ + navigation/websearchbar.h \ + navigation/locationcompleter.h \ + navigation/locationbar.h \ + network/networkmanagerproxy.h \ + network/networkmanager.h \ + other/updater.h \ + other/sourceviewer.h \ + preferences/preferences.h \ + rss/rssmanager.h \ + other/clearprivatedata.h \ + webview/webpage.h \ + webview/tabwidget.h \ + webview/tabbar.h \ + webview/siteinfo.h \ + webview/searchtoolbar.h \ + app/commandlineoptions.h \ + other/aboutdialog.h \ + plugins/plugininterface.h \ + plugins/plugins.h \ + preferences/pluginslist.h \ + plugins/pluginproxy.h \ + tools/clickablelabel.h \ + downloads/downloadoptionsdialog.h \ + tools/treewidget.h \ + bookmarks/bookmarkswidget.h \ + tools/frame.h \ + bookmarks/bookmarksmodel.h \ + sidebar/sidebar.h \ + webview/siteinfowidget.h \ + plugins/clicktoflash.h \ + plugins/webpluginfactory.h \ + downloads/downloaditem.h \ + 3rdparty/ecwin7.h \ + webview/webtab.h \ + rss/rsswidget.h \ + autofill/autofillnotification.h \ + rss/rssnotification.h \ + navigation/locationpopup.h \ + preferences/sslmanager.h \ + tools/animatedwidget.h \ + tools/htmlhighlighter.h \ + other/sourceviewersearch.h \ + adblock/adblocksubscription.h \ + adblock/adblockrule.h \ + adblock/adblockpage.h \ + adblock/adblocknetwork.h \ + adblock/adblockmanager.h \ + adblock/adblockdialog.h \ + adblock/adblockblockednetworkreply.h \ + adblock/adblockicon.h \ + tools/docktitlebarwidget.h \ + sidebar/bookmarkssidebar.h \ + bookmarks/bookmarkicon.h \ + sidebar/historysidebar.h \ + desktopnotifications/desktopnotification.h \ + desktopnotifications/desktopnotificationsfactory.h \ + tools/progressbar.h \ + tools/iconprovider.h \ + network/networkproxyfactory.h \ + tools/closedtabsmanager.h \ + other/statusbarmessage.h \ + tools/buttonbox.h \ + tools/widget.h \ + 3rdparty/squeezelabelv2.h \ + 3rdparty/squeezelabelv1.h \ + tools/buttonwithmenu.h \ + navigation/locationbarsettings.h \ + other/browsinglibrary.h \ + 3rdparty/stylehelper.h \ + 3rdparty/fancytabwidget.h \ + history/webhistoryinterface.h \ + tools/toolbutton.h \ + navigation/navigationbar.h \ + navigation/reloadstopbutton.h \ + preferences/thememanager.h \ + network/qupzillaschemehandler.h \ + tools/globalfunctions.h \ + other/pagescreen.h \ + downloads/downloadfilehelper.h \ + tools/certificateinfowidget.h \ + webview/webinspectordockwidget.h \ + 3rdparty/msvc2008.h \ + app/profileupdater.h \ + preferences/acceptlanguage.h \ + opensearch/opensearchreader.h \ + opensearch/opensearchengine.h \ + opensearch/opensearchenginedelegate.h \ + opensearch/searchenginesmanager.h \ + opensearch/searchenginesdialog.h \ + opensearch/editsearchengine.h \ + bookmarksimport/firefoximporter.h \ + bookmarksimport/chromeimporter.h \ + bookmarksimport/operaimporter.h \ + bookmarksimport/bookmarksimportdialog.h \ + tools/iconfetcher.h \ + tools/followredirectreply.h \ + webview/webhistorywrapper.h \ + tools/pagethumbnailer.h \ + plugins/speeddial.h \ + other/databasewriter.h \ + bookmarksimport/htmlimporter.h \ + tools/enhancedmenu.h \ + navigation/siteicon.h \ + navigation/goicon.h \ + rss/rssicon.h \ + navigation/downicon.h \ + network/cabundleupdater.h \ + app/settings.h \ + app/proxystyle.h \ + popupwindow/popupwebpage.h \ + webview/popupwebview.h \ + popupwindow/popupwindow.h \ + popupwindow/popuplocationbar.h \ + webview/tabbedwebview.h \ + webview/webview.h \ + app/qz_namespace.h \ + webview/webviewsettings.h FORMS += \ - $$PWD/preferences/autofillmanager.ui \ - $$PWD/bookmarks/bookmarksmanager.ui \ - $$PWD/cookies/cookiemanager.ui \ - $$PWD/history/historymanager.ui \ - $$PWD/preferences/preferences.ui \ - $$PWD/rss/rssmanager.ui \ - $$PWD/webview/siteinfo.ui \ - $$PWD/other/aboutdialog.ui \ - $$PWD/preferences/pluginslist.ui \ - $$PWD/downloads/downloadoptionsdialog.ui \ - $$PWD/bookmarks/bookmarkswidget.ui \ - $$PWD/webview/siteinfowidget.ui \ - $$PWD/downloads/downloaditem.ui \ - $$PWD/downloads/downloadmanager.ui \ - $$PWD/rss/rsswidget.ui \ - $$PWD/autofill/autofillnotification.ui \ - $$PWD/rss/rssnotification.ui \ - $$PWD/preferences/sslmanager.ui \ - $$PWD/other/clearprivatedata.ui \ - $$PWD/other/sourceviewersearch.ui \ - $$PWD/other/closedialog.ui \ - $$PWD/adblock/adblockdialog.ui \ - $$PWD/tools/docktitlebarwidget.ui \ - $$PWD/sidebar/bookmarkssidebar.ui \ - $$PWD/sidebar/historysidebar.ui \ - $$PWD/desktopnotifications/desktopnotification.ui \ - $$PWD/webview/jsconfirm.ui \ - $$PWD/webview/jsalert.ui \ - $$PWD/webview/jsprompt.ui \ - $$PWD/other/browsinglibrary.ui \ - $$PWD/webview/searchtoolbar.ui \ - $$PWD/preferences/thememanager.ui \ - $$PWD/other/pagescreen.ui \ - $$PWD/tools/certificateinfowidget.ui \ - $$PWD/preferences/acceptlanguage.ui \ - $$PWD/preferences/addacceptlanguage.ui \ - $$PWD/opensearch/searchenginesdialog.ui \ - $$PWD/opensearch/editsearchengine.ui \ - $$PWD/bookmarksimport/bookmarksimportdialog.ui + preferences/autofillmanager.ui \ + bookmarks/bookmarksmanager.ui \ + cookies/cookiemanager.ui \ + history/historymanager.ui \ + preferences/preferences.ui \ + rss/rssmanager.ui \ + webview/siteinfo.ui \ + other/aboutdialog.ui \ + preferences/pluginslist.ui \ + downloads/downloadoptionsdialog.ui \ + bookmarks/bookmarkswidget.ui \ + webview/siteinfowidget.ui \ + downloads/downloaditem.ui \ + downloads/downloadmanager.ui \ + rss/rsswidget.ui \ + autofill/autofillnotification.ui \ + rss/rssnotification.ui \ + preferences/sslmanager.ui \ + other/clearprivatedata.ui \ + other/sourceviewersearch.ui \ + other/closedialog.ui \ + adblock/adblockdialog.ui \ + tools/docktitlebarwidget.ui \ + sidebar/bookmarkssidebar.ui \ + sidebar/historysidebar.ui \ + desktopnotifications/desktopnotification.ui \ + webview/jsconfirm.ui \ + webview/jsalert.ui \ + webview/jsprompt.ui \ + other/browsinglibrary.ui \ + webview/searchtoolbar.ui \ + preferences/thememanager.ui \ + other/pagescreen.ui \ + tools/certificateinfowidget.ui \ + preferences/acceptlanguage.ui \ + preferences/addacceptlanguage.ui \ + opensearch/searchenginesdialog.ui \ + opensearch/editsearchengine.ui \ + bookmarksimport/bookmarksimportdialog.ui RESOURCES += \ - $$PWD/data/icons.qrc \ - $$PWD/data/html.qrc \ - $$PWD/data/data.qrc + data/icons.qrc \ + data/html.qrc \ + data/data.qrc OTHER_FILES += \ - $$PWD/appicon.rc \ - $$PWD/appicon_os2.rc \ - $$PWD/Info.plist + appicon.rc \ + appicon_os2.rc \ + Info.plist -os2:RC_FILE = $$PWD/appicon_os2.rc -win32:RC_FILE = $$PWD/appicon.rc +os2:RC_FILE = appicon_os2.rc +win32:RC_FILE = appicon.rc diff --git a/translations.pri b/translations.pri index a8f19cb2e..6aa75973b 100644 --- a/translations.pri +++ b/translations.pri @@ -16,7 +16,7 @@ TRANSLATIONS += $$PWD/translations/cs_CZ.ts\ $$PWD/translations/sv_SE.ts\ isEmpty(QMAKE_LRELEASE) { - win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe + win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease unix { !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }