diff --git a/src/lib/3rdparty/qftp.cpp b/src/lib/3rdparty/qftp/qftp.cpp similarity index 100% rename from src/lib/3rdparty/qftp.cpp rename to src/lib/3rdparty/qftp/qftp.cpp diff --git a/src/lib/3rdparty/qftp.h b/src/lib/3rdparty/qftp/qftp.h similarity index 100% rename from src/lib/3rdparty/qftp.h rename to src/lib/3rdparty/qftp/qftp.h diff --git a/src/lib/3rdparty/qftp.pri b/src/lib/3rdparty/qftp/qftp.pri similarity index 67% rename from src/lib/3rdparty/qftp.pri rename to src/lib/3rdparty/qftp/qftp.pri index 79ffba9ae..19195b298 100644 --- a/src/lib/3rdparty/qftp.pri +++ b/src/lib/3rdparty/qftp/qftp.pri @@ -1,2 +1,4 @@ HEADERS += $$PWD/qftp.h $$PWD/qurlinfo.h SOURCES += $$PWD/qftp.cpp $$PWD/qurlinfo.cpp +INCLUDEPATH += $$PWD +DEPENDPATH += $$PWD diff --git a/src/lib/3rdparty/qurlinfo.cpp b/src/lib/3rdparty/qftp/qurlinfo.cpp similarity index 100% rename from src/lib/3rdparty/qurlinfo.cpp rename to src/lib/3rdparty/qftp/qurlinfo.cpp diff --git a/src/lib/3rdparty/qurlinfo.h b/src/lib/3rdparty/qftp/qurlinfo.h similarity index 100% rename from src/lib/3rdparty/qurlinfo.h rename to src/lib/3rdparty/qftp/qurlinfo.h diff --git a/src/lib/3rdparty/qtlocalpeer.cpp b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp similarity index 100% rename from src/lib/3rdparty/qtlocalpeer.cpp rename to src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp diff --git a/src/lib/3rdparty/qtlocalpeer.h b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.h similarity index 100% rename from src/lib/3rdparty/qtlocalpeer.h rename to src/lib/3rdparty/qtsingleapplication/qtlocalpeer.h diff --git a/src/lib/3rdparty/qtlockedfile.cpp b/src/lib/3rdparty/qtsingleapplication/qtlockedfile.cpp similarity index 100% rename from src/lib/3rdparty/qtlockedfile.cpp rename to src/lib/3rdparty/qtsingleapplication/qtlockedfile.cpp diff --git a/src/lib/3rdparty/qtlockedfile.h b/src/lib/3rdparty/qtsingleapplication/qtlockedfile.h similarity index 100% rename from src/lib/3rdparty/qtlockedfile.h rename to src/lib/3rdparty/qtsingleapplication/qtlockedfile.h diff --git a/src/lib/3rdparty/qtlockedfile_unix.cpp b/src/lib/3rdparty/qtsingleapplication/qtlockedfile_unix.cpp similarity index 100% rename from src/lib/3rdparty/qtlockedfile_unix.cpp rename to src/lib/3rdparty/qtsingleapplication/qtlockedfile_unix.cpp diff --git a/src/lib/3rdparty/qtlockedfile_win.cpp b/src/lib/3rdparty/qtsingleapplication/qtlockedfile_win.cpp similarity index 100% rename from src/lib/3rdparty/qtlockedfile_win.cpp rename to src/lib/3rdparty/qtsingleapplication/qtlockedfile_win.cpp diff --git a/src/lib/3rdparty/qtsingleapplication.cpp b/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.cpp similarity index 100% rename from src/lib/3rdparty/qtsingleapplication.cpp rename to src/lib/3rdparty/qtsingleapplication/qtsingleapplication.cpp diff --git a/src/lib/3rdparty/qtsingleapplication.h b/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.h similarity index 100% rename from src/lib/3rdparty/qtsingleapplication.h rename to src/lib/3rdparty/qtsingleapplication/qtsingleapplication.h diff --git a/src/lib/3rdparty/qtsingleapplication.pri b/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.pri similarity index 100% rename from src/lib/3rdparty/qtsingleapplication.pri rename to src/lib/3rdparty/qtsingleapplication/qtsingleapplication.pri diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp index 1f6a43ae8..a4ae17be1 100644 --- a/src/lib/app/browserwindow.cpp +++ b/src/lib/app/browserwindow.cpp @@ -50,7 +50,7 @@ #include "browsinglibrary.h" #include "navigationbar.h" #include "pagescreen.h" -#include "webinspectordockwidget.h" +#include "webinspector.h" #include "bookmarksimport/bookmarksimportdialog.h" #include "qztools.h" #include "actioncopy.h" diff --git a/src/lib/lib.pro b/src/lib/lib.pro index 93881af48..a6a846b69 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -10,525 +10,504 @@ TEMPLATE = lib DEFINES *= QUPZILLA_SHAREDLIBRARY include(../defines.pri) -include(3rdparty/qtsingleapplication.pri) include(../../translations/translations.pri) +include(3rdparty/qtsingleapplication/qtsingleapplication.pri) include(plugins/qtwebkit/qtwebkit-plugins.pri) CONFIG(debug, debug|release): include(../../tests/modeltest/modeltest.pri) unix:!contains(DEFINES, "DISABLE_DBUS") QT += dbus -INCLUDEPATH += 3rdparty\ - app\ - autofill\ - bookmarks\ - cookies\ - session\ - downloads\ - history\ - navigation\ - network\ - other\ - preferences\ - rss\ - tools\ - utils\ - webview\ - plugins\ - sidebar\ - data\ - adblock\ - desktopnotifications\ - opensearch\ - popupwindow\ +INCLUDEPATH += 3rdparty \ + adblock \ + app \ + autofill \ + bookmarks \ + cookies \ + downloads \ + history \ + navigation \ + network \ + notifications \ + opensearch \ + other \ + plugins \ + popupwindow \ + preferences \ + rss \ + session \ + sidebar \ + tabwidget \ + tools \ + webkit \ + webtab \ -DEPENDPATH += 3rdparty\ - app\ - autofill\ - bookmarks\ - cookies\ - session\ - downloads\ - history\ - navigation\ - network\ - other\ - preferences\ - rss\ - tools\ - utils\ - webview\ - plugins\ - sidebar\ - data\ - adblock\ - desktopnotifications\ - opensearch\ - popupwindow\ +DEPENDPATH += $$INCLUDEPATH \ + data \ SOURCES += \ - webview/tabpreview.cpp \ - 3rdparty/qtwin.cpp \ - 3rdparty/lineedit.cpp \ - app/mainapplication.cpp \ - app/autosaver.cpp \ - preferences/autofillmanager.cpp \ - bookmarks/bookmarkstoolbar.cpp \ - bookmarks/bookmarksmanager.cpp \ - cookies/cookiemanager.cpp \ - cookies/cookiejar.cpp \ - downloads/downloadmanager.cpp \ - history/historymanager.cpp \ - navigation/websearchbar.cpp \ - navigation/locationbar.cpp \ - navigation/locationbarpopup.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 \ - plugins/pluginproxy.cpp \ - tools/clickablelabel.cpp \ - downloads/downloadoptionsdialog.cpp \ - tools/treewidget.cpp \ - bookmarks/bookmarkswidget.cpp \ - tools/frame.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 \ - preferences/sslmanager.cpp \ - preferences/jsoptions.cpp \ - tools/animatedwidget.cpp \ - tools/htmlhighlighter.cpp \ - tools/colors.cpp \ - other/sourceviewersearch.cpp \ - adblock/adblocksubscription.cpp \ - adblock/adblockrule.cpp \ - adblock/adblockmanager.cpp \ - adblock/adblockdialog.cpp \ - adblock/adblockblockednetworkreply.cpp \ - adblock/adblockicon.cpp \ - tools/docktitlebarwidget.cpp \ - sidebar/bookmarkssidebar.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 \ - other/browsinglibrary.cpp \ - 3rdparty/stylehelper.cpp \ 3rdparty/fancytabwidget.cpp \ - history/webhistoryinterface.cpp \ - tools/toolbutton.cpp \ - navigation/navigationbar.cpp \ - navigation/reloadstopbutton.cpp \ - preferences/thememanager.cpp \ - tools/qztools.cpp \ - other/pagescreen.cpp \ - downloads/downloadfilehelper.cpp \ - tools/certificateinfowidget.cpp \ - webview/webinspectordockwidget.cpp \ - preferences/acceptlanguage.cpp \ - opensearch/opensearchreader.cpp \ - opensearch/opensearchengine.cpp \ - opensearch/opensearchenginedelegate.cpp \ - opensearch/searchenginesmanager.cpp \ - opensearch/searchenginesdialog.cpp \ - opensearch/editsearchengine.cpp \ + 3rdparty/lineedit.cpp \ + 3rdparty/processinfo.cpp \ + 3rdparty/qtwin.cpp \ + 3rdparty/squeezelabelv1.cpp \ + 3rdparty/squeezelabelv2.cpp \ + 3rdparty/stylehelper.cpp \ + adblock/adblockaddsubscriptiondialog.cpp \ + adblock/adblockblockednetworkreply.cpp \ + adblock/adblockdialog.cpp \ + adblock/adblockicon.cpp \ + adblock/adblockmanager.cpp \ + adblock/adblockrule.cpp \ + adblock/adblocksearchtree.cpp \ + adblock/adblocksubscription.cpp \ + adblock/adblocktreewidget.cpp \ + app/autosaver.cpp \ + app/browserwindow.cpp \ + app/commandlineoptions.cpp \ + app/datapaths.cpp \ + app/mainapplication.cpp \ + app/mainmenu.cpp \ + app/profilemanager.cpp \ + app/proxystyle.cpp \ + app/settings.cpp \ + autofill/autofill.cpp \ + autofill/autofillicon.cpp \ + autofill/autofillnotification.cpp \ + autofill/autofillwidget.cpp \ + autofill/pageformcompleter.cpp \ + autofill/passwordbackends/databaseencryptedpasswordbackend.cpp \ + autofill/passwordbackends/databasepasswordbackend.cpp \ + autofill/passwordbackends/passwordbackend.cpp \ + autofill/passwordmanager.cpp \ + bookmarks/bookmarkitem.cpp \ + bookmarks/bookmarks.cpp \ + bookmarks/bookmarksexport/bookmarksexportdialog.cpp \ + bookmarks/bookmarksexport/bookmarksexporter.cpp \ + bookmarks/bookmarksexport/htmlexporter.cpp \ + bookmarks/bookmarksicon.cpp \ + bookmarks/bookmarksimport/bookmarksimportdialog.cpp \ bookmarks/bookmarksimport/bookmarksimporter.cpp \ bookmarks/bookmarksimport/firefoximporter.cpp \ - bookmarks/bookmarksimport/chromeimporter.cpp \ - bookmarks/bookmarksimport/operaimporter.cpp \ - bookmarks/bookmarksimport/ieimporter.cpp \ bookmarks/bookmarksimport/htmlimporter.cpp \ - bookmarks/bookmarksimport/bookmarksimportdialog.cpp \ - tools/iconfetcher.cpp \ - tools/followredirectreply.cpp \ - tools/pagethumbnailer.cpp \ - plugins/speeddial.cpp \ - tools/enhancedmenu.cpp \ - navigation/siteicon.cpp \ - navigation/goicon.cpp \ - rss/rssicon.cpp \ + bookmarks/bookmarksimport/chromeimporter.cpp \ + bookmarks/bookmarksimport/ieimporter.cpp \ + bookmarks/bookmarksimport/operaimporter.cpp \ + bookmarks/bookmarksitemdelegate.cpp \ + bookmarks/bookmarksmanager.cpp \ + bookmarks/bookmarksmenu.cpp \ + bookmarks/bookmarksmodel.cpp \ + bookmarks/bookmarkstoolbarbutton.cpp \ + bookmarks/bookmarkstoolbar.cpp \ + bookmarks/bookmarkstools.cpp \ + bookmarks/bookmarkstreeview.cpp \ + bookmarks/bookmarkswidget.cpp \ + cookies/cookiejar.cpp \ + cookies/cookiemanager.cpp \ + downloads/downloadfilehelper.cpp \ + downloads/downloaditem.cpp \ + downloads/downloadmanager.cpp \ + downloads/downloadoptionsdialog.cpp \ + history/history.cpp \ + history/historyitem.cpp \ + history/historymanager.cpp \ + history/historymenu.cpp \ + history/historymodel.cpp \ + history/historyview.cpp \ + history/webhistoryinterface.cpp \ + navigation/completer/locationcompleter.cpp \ + navigation/completer/locationcompleterdelegate.cpp \ + navigation/completer/locationcompletermodel.cpp \ + navigation/completer/locationcompleterrefreshjob.cpp \ + navigation/completer/locationcompleterview.cpp \ navigation/downicon.cpp \ + navigation/goicon.cpp \ + navigation/locationbar.cpp \ + navigation/locationbarpopup.cpp \ + navigation/navigationbar.cpp \ + navigation/navigationcontainer.cpp \ + navigation/reloadstopbutton.cpp \ + navigation/siteicon.cpp \ + navigation/websearchbar.cpp \ network/cabundleupdater.cpp \ - app/settings.cpp \ - app/proxystyle.cpp \ + network/networkmanager.cpp \ + network/networkmanagerproxy.cpp \ + network/networkproxyfactory.cpp \ + network/pac/pacmanager.cpp \ + network/pac/proxyautoconfig.cpp \ + network/schemehandlers/adblockschemehandler.cpp \ + network/schemehandlers/fileschemehandler.cpp \ + network/schemehandlers/ftpschemehandler.cpp \ + network/schemehandlers/qupzillaschemehandler.cpp \ + network/sslerrordialog.cpp \ + notifications/desktopnotification.cpp \ + notifications/desktopnotificationsfactory.cpp \ + opensearch/editsearchengine.cpp \ + opensearch/opensearchengine.cpp \ + opensearch/opensearchenginedelegate.cpp \ + opensearch/opensearchreader.cpp \ + opensearch/searchenginesdialog.cpp \ + opensearch/searchenginesmanager.cpp \ + other/aboutdialog.cpp \ + other/browsinglibrary.cpp \ + other/clearprivatedata.cpp \ + other/checkboxdialog.cpp \ + other/iconchooser.cpp \ + other/licenseviewer.cpp \ + other/pagescreen.cpp \ + other/qzsettings.cpp \ + other/siteinfo.cpp \ + other/siteinfowidget.cpp \ + other/sourceviewer.cpp \ + other/sourceviewersearch.cpp \ + other/statusbarmessage.cpp \ + other/updater.cpp \ + other/useragentmanager.cpp \ + plugins/clicktoflash.cpp \ + plugins/pluginproxy.cpp \ + plugins/plugins.cpp \ + plugins/speeddial.cpp \ + popupwindow/popuplocationbar.cpp \ + popupwindow/popupstatusbarmessage.cpp \ popupwindow/popupwebpage.cpp \ popupwindow/popupwebview.cpp \ popupwindow/popupwindow.cpp \ - popupwindow/popuplocationbar.cpp \ - webview/tabbedwebview.cpp \ - webview/webview.cpp \ + preferences/acceptlanguage.cpp \ + preferences/autofillmanager.cpp \ + preferences/jsoptions.cpp \ preferences/pluginlistdelegate.cpp \ - popupwindow/popupstatusbarmessage.cpp \ - other/licenseviewer.cpp \ - other/checkboxdialog.cpp \ - tools/plaineditwithlines.cpp \ - tools/focusselectlineedit.cpp \ - navigation/completer/locationcompleterdelegate.cpp \ - navigation/completer/locationcompleter.cpp \ - navigation/completer/locationcompletermodel.cpp \ - navigation/completer/locationcompleterview.cpp \ - history/history.cpp \ - history/historymodel.cpp \ - history/historyview.cpp \ - history/historyitem.cpp \ - tools/headerview.cpp \ - other/iconchooser.cpp \ - adblock/adblocktreewidget.cpp \ - adblock/adblockaddsubscriptiondialog.cpp \ - tools/emptynetworkreply.cpp \ - 3rdparty/processinfo.cpp \ preferences/pluginsmanager.cpp \ - other/qzsettings.cpp \ - other/useragentmanager.cpp \ + preferences/preferences.cpp \ + preferences/sslmanager.cpp \ + preferences/thememanager.cpp \ preferences/useragentdialog.cpp \ + rss/rssicon.cpp \ + rss/rssmanager.cpp \ + rss/rssnotification.cpp \ + rss/rsswidget.cpp \ session/recoverywidget.cpp \ session/restoremanager.cpp \ - network/schemehandlers/qupzillaschemehandler.cpp \ - network/schemehandlers/adblockschemehandler.cpp \ - network/schemehandlers/fileschemehandler.cpp \ - tools/listitemdelegate.cpp \ + sidebar/bookmarkssidebar.cpp \ + sidebar/historysidebar.cpp \ + sidebar/sidebar.cpp \ + tabwidget/combotabbar.cpp \ + tabwidget/tabbar.cpp \ + tabwidget/tabicon.cpp \ + tabwidget/tabpreview.cpp \ + tabwidget/tabstackedwidget.cpp \ + tabwidget/tabwidget.cpp \ + tools/actioncopy.cpp \ + tools/aesinterface.cpp \ + tools/animatedwidget.cpp \ + tools/buttonbox.cpp \ + tools/buttonwithmenu.cpp \ + tools/certificateinfowidget.cpp \ + tools/clickablelabel.cpp \ + tools/closedtabsmanager.cpp \ + tools/colors.cpp \ + tools/delayedfilewatcher.cpp \ + tools/docktitlebarwidget.cpp \ + tools/emptynetworkreply.cpp \ + tools/enhancedmenu.cpp \ + tools/focusselectlineedit.cpp \ + tools/followredirectreply.cpp \ + tools/frame.cpp \ + tools/headerview.cpp \ + tools/horizontallistwidget.cpp \ + tools/htmlhighlighter.cpp \ + tools/html5permissions/html5permissionsdialog.cpp \ tools/html5permissions/html5permissionsmanager.cpp \ tools/html5permissions/html5permissionsnotification.cpp \ - tools/html5permissions/html5permissionsdialog.cpp \ - autofill/pageformcompleter.cpp \ - autofill/autofill.cpp \ - network/schemehandlers/ftpschemehandler.cpp \ - autofill/autofillicon.cpp \ - autofill/autofillwidget.cpp \ - tools/menubar.cpp \ - navigation/navigationcontainer.cpp \ - tools/horizontallistwidget.cpp \ - tools/mactoolbutton.cpp \ - tools/actioncopy.cpp \ - network/pac/proxyautoconfig.cpp \ - network/pac/pacmanager.cpp \ - tools/delayedfilewatcher.cpp \ - autofill/passwordmanager.cpp \ - autofill/passwordbackends/databasepasswordbackend.cpp \ - autofill/passwordbackends/passwordbackend.cpp \ - tools/aesinterface.cpp \ - autofill/passwordbackends/databaseencryptedpasswordbackend.cpp \ - network/sslerrordialog.cpp \ - adblock/adblocksearchtree.cpp \ - tools/tabstackedwidget.cpp \ - tools/combotabbar.cpp \ - webview/javascript/externaljsobject.cpp \ - bookmarks/bookmarks.cpp \ - bookmarks/bookmarkitem.cpp \ + tools/iconfetcher.cpp \ + tools/iconprovider.cpp \ tools/json.cpp \ - bookmarks/bookmarksmodel.cpp \ - bookmarks/bookmarkstreeview.cpp \ - bookmarks/bookmarkstools.cpp \ - bookmarks/bookmarksmenu.cpp \ - bookmarks/bookmarksicon.cpp \ - bookmarks/bookmarksitemdelegate.cpp \ - bookmarks/bookmarkstoolbarbutton.cpp \ - bookmarks/bookmarksexport/bookmarksexporter.cpp \ - bookmarks/bookmarksexport/bookmarksexportdialog.cpp \ - bookmarks/bookmarksexport/htmlexporter.cpp \ - app/browserwindow.cpp \ - history/historymenu.cpp \ - app/datapaths.cpp \ - app/profilemanager.cpp \ - app/mainmenu.cpp \ + tools/listitemdelegate.cpp \ + tools/mactoolbutton.cpp \ + tools/menubar.cpp \ + tools/pagethumbnailer.cpp \ + tools/plaineditwithlines.cpp \ + tools/progressbar.cpp \ + tools/qztools.cpp \ tools/sqldatabase.cpp \ - navigation/completer/locationcompleterrefreshjob.cpp \ - webview/tabicon.cpp \ - webview/loadrequest.cpp - + tools/toolbutton.cpp \ + tools/treewidget.cpp \ + tools/widget.cpp \ + webkit/javascript/externaljsobject.cpp \ + webkit/loadrequest.cpp \ + webkit/webinspector.cpp \ + webkit/webpage.cpp \ + webkit/webpluginfactory.cpp \ + webkit/webview.cpp \ + webtab/searchtoolbar.cpp \ + webtab/tabbedwebview.cpp \ + webtab/webtab.cpp \ HEADERS += \ - webview/tabpreview.h \ - 3rdparty/qtwin.h \ - 3rdparty/lineedit.h \ - app/mainapplication.h \ - app/autosaver.h \ - preferences/autofillmanager.h \ - bookmarks/bookmarkstoolbar.h \ - bookmarks/bookmarksmanager.h \ - cookies/cookiemanager.h \ - cookies/cookiejar.h \ - downloads/downloadmanager.h \ - history/historymanager.h \ - navigation/websearchbar.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 \ - plugins/pluginproxy.h \ - tools/clickablelabel.h \ - downloads/downloadoptionsdialog.h \ - tools/treewidget.h \ - bookmarks/bookmarkswidget.h \ - tools/frame.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 \ - preferences/sslmanager.h \ - preferences/jsoptions.h \ - tools/animatedwidget.h \ - tools/htmlhighlighter.h \ - other/sourceviewersearch.h \ - adblock/adblocksubscription.h \ - adblock/adblockrule.h \ - adblock/adblockmanager.h \ - adblock/adblockdialog.h \ - adblock/adblockblockednetworkreply.h \ - adblock/adblockicon.h \ - tools/docktitlebarwidget.h \ - sidebar/bookmarkssidebar.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 \ - other/browsinglibrary.h \ - 3rdparty/stylehelper.h \ 3rdparty/fancytabwidget.h \ - history/webhistoryinterface.h \ - tools/toolbutton.h \ - navigation/navigationbar.h \ - navigation/reloadstopbutton.h \ - preferences/thememanager.h \ - tools/qztools.h \ - other/pagescreen.h \ - downloads/downloadfilehelper.h \ - tools/certificateinfowidget.h \ - webview/webinspectordockwidget.h \ + 3rdparty/lineedit.h \ 3rdparty/msvc2008.h \ - preferences/acceptlanguage.h \ - opensearch/opensearchreader.h \ - opensearch/opensearchengine.h \ - opensearch/opensearchenginedelegate.h \ - opensearch/searchenginesmanager.h \ - opensearch/searchenginesdialog.h \ - opensearch/editsearchengine.h \ + 3rdparty/processinfo.h \ + 3rdparty/qtwin.h \ + 3rdparty/squeezelabelv1.h \ + 3rdparty/squeezelabelv2.h \ + 3rdparty/stylehelper.h \ + adblock/adblockaddsubscriptiondialog.h \ + adblock/adblockblockednetworkreply.h \ + adblock/adblockdialog.h \ + adblock/adblockicon.h \ + adblock/adblockmanager.h \ + adblock/adblockrule.h \ + adblock/adblocksearchtree.h \ + adblock/adblocksubscription.h \ + adblock/adblocktreewidget.h \ + app/autosaver.h \ + app/browserwindow.h \ + app/commandlineoptions.h \ + app/datapaths.h \ + app/mainapplication.h \ + app/mainmenu.h \ + app/profilemanager.h \ + app/proxystyle.h \ + app/qzcommon.h \ + app/settings.h \ + autofill/autofill.h \ + autofill/autofillicon.h \ + autofill/autofillnotification.h \ + autofill/autofillwidget.h \ + autofill/pageformcompleter.h \ + autofill/passwordbackends/databaseencryptedpasswordbackend.h \ + autofill/passwordbackends/databasepasswordbackend.h \ + autofill/passwordbackends/passwordbackend.h \ + autofill/passwordmanager.h \ + bookmarks/bookmarkitem.h \ + bookmarks/bookmarksexport/bookmarksexportdialog.h \ + bookmarks/bookmarksexport/bookmarksexporter.h \ + bookmarks/bookmarksexport/htmlexporter.h \ + bookmarks/bookmarks.h \ + bookmarks/bookmarksicon.h \ + bookmarks/bookmarksimport/bookmarksimportdialog.h \ bookmarks/bookmarksimport/bookmarksimporter.h \ bookmarks/bookmarksimport/firefoximporter.h \ - bookmarks/bookmarksimport/chromeimporter.h \ - bookmarks/bookmarksimport/operaimporter.h \ - bookmarks/bookmarksimport/ieimporter.h \ bookmarks/bookmarksimport/htmlimporter.h \ - bookmarks/bookmarksimport/bookmarksimportdialog.h \ - tools/iconfetcher.h \ - tools/followredirectreply.h \ - tools/pagethumbnailer.h \ - plugins/speeddial.h \ - tools/enhancedmenu.h \ - navigation/siteicon.h \ - navigation/goicon.h \ - rss/rssicon.h \ + bookmarks/bookmarksimport/chromeimporter.h \ + bookmarks/bookmarksimport/ieimporter.h \ + bookmarks/bookmarksimport/operaimporter.h \ + bookmarks/bookmarksitemdelegate.h \ + bookmarks/bookmarksmanager.h \ + bookmarks/bookmarksmenu.h \ + bookmarks/bookmarksmodel.h \ + bookmarks/bookmarkstoolbarbutton.h \ + bookmarks/bookmarkstoolbar.h \ + bookmarks/bookmarkstools.h \ + bookmarks/bookmarkstreeview.h \ + bookmarks/bookmarkswidget.h \ + cookies/cookiejar.h \ + cookies/cookiemanager.h \ + downloads/downloadfilehelper.h \ + downloads/downloaditem.h \ + downloads/downloadmanager.h \ + downloads/downloadoptionsdialog.h \ + history/history.h \ + history/historyitem.h \ + history/historymanager.h \ + history/historymenu.h \ + history/historymodel.h \ + history/historyview.h \ + history/webhistoryinterface.h \ + navigation/completer/locationcompleterdelegate.h \ + navigation/completer/locationcompleter.h \ + navigation/completer/locationcompletermodel.h \ + navigation/completer/locationcompleterrefreshjob.h \ + navigation/completer/locationcompleterview.h \ navigation/downicon.h \ + navigation/goicon.h \ + navigation/locationbar.h \ + navigation/locationbarpopup.h \ + navigation/navigationbar.h \ + navigation/navigationcontainer.h \ + navigation/reloadstopbutton.h \ + navigation/siteicon.h \ + navigation/websearchbar.h \ network/cabundleupdater.h \ - app/settings.h \ - app/proxystyle.h \ + network/networkmanager.h \ + network/networkmanagerproxy.h \ + network/networkproxyfactory.h \ + network/pac/pacdatetime.h \ + network/pac/pacmanager.h \ + network/pac/proxyautoconfig.h \ + network/schemehandlers/adblockschemehandler.h \ + network/schemehandlers/fileschemehandler.h \ + network/schemehandlers/ftpschemehandler.h \ + network/schemehandlers/qupzillaschemehandler.h \ + network/schemehandlers/schemehandler.h \ + network/sslerrordialog.h \ + notifications/desktopnotification.h \ + notifications/desktopnotificationsfactory.h \ + opensearch/editsearchengine.h \ + opensearch/opensearchenginedelegate.h \ + opensearch/opensearchengine.h \ + opensearch/opensearchreader.h \ + opensearch/searchenginesdialog.h \ + opensearch/searchenginesmanager.h \ + other/aboutdialog.h \ + other/browsinglibrary.h \ + other/clearprivatedata.h \ + other/checkboxdialog.h \ + other/iconchooser.h \ + other/licenseviewer.h \ + other/pagescreen.h \ + other/qzsettings.h \ + other/siteinfo.h \ + other/siteinfowidget.h \ + other/sourceviewer.h \ + other/sourceviewersearch.h \ + other/statusbarmessage.h \ + other/updater.h \ + other/useragentmanager.h \ + plugins/clicktoflash.h \ + plugins/plugininterface.h \ + plugins/pluginproxy.h \ + plugins/plugins.h \ + plugins/speeddial.h \ + popupwindow/popuplocationbar.h \ + popupwindow/popupstatusbarmessage.h \ popupwindow/popupwebpage.h \ popupwindow/popupwebview.h \ popupwindow/popupwindow.h \ - popupwindow/popuplocationbar.h \ - webview/tabbedwebview.h \ - webview/webview.h \ + preferences/acceptlanguage.h \ + preferences/autofillmanager.h \ + preferences/jsoptions.h \ preferences/pluginlistdelegate.h \ - popupwindow/popupstatusbarmessage.h \ - other/licenseviewer.h \ - other/checkboxdialog.h \ - tools/plaineditwithlines.h \ - sidebar/sidebarinterface.h \ - tools/focusselectlineedit.h \ - navigation/completer/locationcompleterdelegate.h \ - navigation/completer/locationcompleter.h \ - navigation/completer/locationcompleterview.h \ - history/history.h \ - history/historymodel.h \ - history/historyview.h \ - history/historyitem.h \ - tools/headerview.h \ - other/iconchooser.h \ - adblock/adblocktreewidget.h \ - adblock/adblockaddsubscriptiondialog.h \ - tools/emptynetworkreply.h \ - 3rdparty/processinfo.h \ preferences/pluginsmanager.h \ - other/qzsettings.h \ - other/useragentmanager.h \ + preferences/preferences.h \ + preferences/sslmanager.h \ + preferences/thememanager.h \ preferences/useragentdialog.h \ + rss/rssicon.h \ + rss/rssmanager.h \ + rss/rssnotification.h \ + rss/rsswidget.h \ session/recoverywidget.h \ session/restoremanager.h \ - network/schemehandlers/schemehandler.h \ - network/schemehandlers/qupzillaschemehandler.h \ - network/schemehandlers/adblockschemehandler.h \ - network/schemehandlers/fileschemehandler.h \ - tools/listitemdelegate.h \ + sidebar/bookmarkssidebar.h \ + sidebar/historysidebar.h \ + sidebar/sidebar.h \ + sidebar/sidebarinterface.h \ + tabwidget/combotabbar.h \ + tabwidget/tabbar.h \ + tabwidget/tabicon.h \ + tabwidget/tabpreview.h \ + tabwidget/tabstackedwidget.h \ + tabwidget/tabwidget.h \ + tools/actioncopy.h \ + tools/aesinterface.h \ + tools/animatedwidget.h \ + tools/buttonbox.h \ + tools/buttonwithmenu.h \ + tools/certificateinfowidget.h \ + tools/clickablelabel.h \ + tools/closedtabsmanager.h \ + tools/colors.h \ + tools/delayedfilewatcher.h \ + tools/docktitlebarwidget.h \ + tools/emptynetworkreply.h \ + tools/enhancedmenu.h \ + tools/focusselectlineedit.h \ + tools/followredirectreply.h \ + tools/frame.h \ + tools/headerview.h \ + tools/horizontallistwidget.h \ + tools/htmlhighlighter.h \ + tools/html5permissions/html5permissionsdialog.h \ tools/html5permissions/html5permissionsmanager.h \ tools/html5permissions/html5permissionsnotification.h \ - tools/html5permissions/html5permissionsdialog.h \ - autofill/pageformcompleter.h \ - autofill/autofill.h \ - network/schemehandlers/ftpschemehandler.h \ - autofill/autofillicon.h \ - autofill/autofillwidget.h \ - tools/menubar.h \ - navigation/navigationcontainer.h \ - tools/horizontallistwidget.h \ - tools/mactoolbutton.h \ - tools/qzregexp.h \ - tools/actioncopy.h \ - network/pac/proxyautoconfig.h \ - network/pac/pacmanager.h \ - network/pac/pacdatetime.h \ - tools/delayedfilewatcher.h \ - autofill/passwordmanager.h \ - autofill/passwordbackends/passwordbackend.h \ - autofill/passwordbackends/databasepasswordbackend.h \ - tools/aesinterface.h \ - autofill/passwordbackends/databaseencryptedpasswordbackend.h \ - network/sslerrordialog.h \ - adblock/adblocksearchtree.h \ - tools/tabstackedwidget.h \ - tools/combotabbar.h \ - webview/javascript/externaljsobject.h \ - bookmarks/bookmarks.h \ - bookmarks/bookmarkitem.h \ + tools/iconfetcher.h \ + tools/iconprovider.h \ tools/json.h \ - bookmarks/bookmarksmodel.h \ - bookmarks/bookmarkstreeview.h \ - bookmarks/bookmarkstools.h \ - bookmarks/bookmarksmenu.h \ - bookmarks/bookmarksicon.h \ - bookmarks/bookmarksitemdelegate.h \ - bookmarks/bookmarkstoolbarbutton.h \ - bookmarks/bookmarksexport/bookmarksexporter.h \ - bookmarks/bookmarksexport/bookmarksexportdialog.h \ - bookmarks/bookmarksexport/htmlexporter.h \ - app/browserwindow.h \ - app/qzcommon.h \ - history/historymenu.h \ - app/datapaths.h \ - app/profilemanager.h \ - app/mainmenu.h \ + tools/listitemdelegate.h \ + tools/mactoolbutton.h \ + tools/menubar.h \ + tools/pagethumbnailer.h \ + tools/plaineditwithlines.h \ + tools/progressbar.h \ + tools/qztools.h \ tools/sqldatabase.h \ - navigation/completer/locationcompleterrefreshjob.h \ - webview/tabicon.h \ - webview/loadrequest.h + tools/toolbutton.h \ + tools/treewidget.h \ + tools/widget.h \ + webkit/javascript/externaljsobject.h \ + webkit/loadrequest.h \ + webkit/webinspector.h \ + webkit/webpage.h \ + webkit/webpluginfactory.h \ + webkit/webview.h \ + webtab/searchtoolbar.h \ + webtab/tabbedwebview.h \ + webtab/webtab.h \ FORMS += \ - 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 \ - preferences/jsoptions.ui \ - other/clearprivatedata.ui \ - other/sourceviewersearch.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 \ - bookmarks/bookmarksimport/bookmarksimportdialog.ui \ - other/checkboxdialog.ui \ - other/iconchooser.ui \ adblock/adblockaddsubscriptiondialog.ui \ - preferences/useragentdialog.ui \ - session/recoverywidget.ui \ - tools/html5permissions/html5permissionsnotification.ui \ - tools/html5permissions/html5permissionsdialog.ui \ + adblock/adblockdialog.ui \ + autofill/autofillnotification.ui \ autofill/autofillwidget.ui \ autofill/passwordbackends/masterpassworddialog.ui \ + bookmarks/bookmarksexport/bookmarksexportdialog.ui \ + bookmarks/bookmarksimport/bookmarksimportdialog.ui \ + bookmarks/bookmarksmanager.ui \ + bookmarks/bookmarkswidget.ui \ + cookies/cookiemanager.ui \ + downloads/downloaditem.ui \ + downloads/downloadmanager.ui \ + downloads/downloadoptionsdialog.ui \ + history/historymanager.ui \ network/sslerrordialog.ui \ - bookmarks/bookmarksexport/bookmarksexportdialog.ui + notifications/desktopnotification.ui \ + opensearch/editsearchengine.ui \ + opensearch/searchenginesdialog.ui \ + other/aboutdialog.ui \ + other/browsinglibrary.ui \ + other/clearprivatedata.ui \ + other/checkboxdialog.ui \ + other/iconchooser.ui \ + other/pagescreen.ui \ + other/siteinfo.ui \ + other/siteinfowidget.ui \ + other/sourceviewersearch.ui \ + preferences/acceptlanguage.ui \ + preferences/addacceptlanguage.ui \ + preferences/autofillmanager.ui \ + preferences/jsoptions.ui \ + preferences/pluginslist.ui \ + preferences/preferences.ui \ + preferences/sslmanager.ui \ + preferences/thememanager.ui \ + preferences/useragentdialog.ui \ + rss/rssmanager.ui \ + rss/rssnotification.ui \ + rss/rsswidget.ui \ + session/recoverywidget.ui \ + sidebar/bookmarkssidebar.ui \ + sidebar/historysidebar.ui \ + tools/certificateinfowidget.ui \ + tools/docktitlebarwidget.ui \ + tools/html5permissions/html5permissionsdialog.ui \ + tools/html5permissions/html5permissionsnotification.ui \ + webkit/jsalert.ui \ + webkit/jsconfirm.ui \ + webkit/jsprompt.ui \ + webtab/searchtoolbar.ui \ RESOURCES += \ - data/icons.qrc \ - data/html.qrc \ - data/data.qrc \ data/certs.qrc \ + data/data.qrc \ + data/html.qrc \ + data/icons.qrc \ data/oxygen-fallback.qrc isEqual(QT_MAJOR_VERSION, 5) { - include(3rdparty/qftp.pri) - + include(3rdparty/qftp/qftp.pri) SOURCES += tools/qzregexp.cpp } diff --git a/src/lib/desktopnotifications/desktopnotification.cpp b/src/lib/notifications/desktopnotification.cpp similarity index 100% rename from src/lib/desktopnotifications/desktopnotification.cpp rename to src/lib/notifications/desktopnotification.cpp diff --git a/src/lib/desktopnotifications/desktopnotification.h b/src/lib/notifications/desktopnotification.h similarity index 100% rename from src/lib/desktopnotifications/desktopnotification.h rename to src/lib/notifications/desktopnotification.h diff --git a/src/lib/desktopnotifications/desktopnotification.ui b/src/lib/notifications/desktopnotification.ui similarity index 100% rename from src/lib/desktopnotifications/desktopnotification.ui rename to src/lib/notifications/desktopnotification.ui diff --git a/src/lib/desktopnotifications/desktopnotificationsfactory.cpp b/src/lib/notifications/desktopnotificationsfactory.cpp similarity index 100% rename from src/lib/desktopnotifications/desktopnotificationsfactory.cpp rename to src/lib/notifications/desktopnotificationsfactory.cpp diff --git a/src/lib/desktopnotifications/desktopnotificationsfactory.h b/src/lib/notifications/desktopnotificationsfactory.h similarity index 100% rename from src/lib/desktopnotifications/desktopnotificationsfactory.h rename to src/lib/notifications/desktopnotificationsfactory.h diff --git a/src/lib/webview/siteinfo.cpp b/src/lib/other/siteinfo.cpp similarity index 100% rename from src/lib/webview/siteinfo.cpp rename to src/lib/other/siteinfo.cpp diff --git a/src/lib/webview/siteinfo.h b/src/lib/other/siteinfo.h similarity index 100% rename from src/lib/webview/siteinfo.h rename to src/lib/other/siteinfo.h diff --git a/src/lib/webview/siteinfo.ui b/src/lib/other/siteinfo.ui similarity index 100% rename from src/lib/webview/siteinfo.ui rename to src/lib/other/siteinfo.ui diff --git a/src/lib/webview/siteinfowidget.cpp b/src/lib/other/siteinfowidget.cpp similarity index 100% rename from src/lib/webview/siteinfowidget.cpp rename to src/lib/other/siteinfowidget.cpp diff --git a/src/lib/webview/siteinfowidget.h b/src/lib/other/siteinfowidget.h similarity index 100% rename from src/lib/webview/siteinfowidget.h rename to src/lib/other/siteinfowidget.h diff --git a/src/lib/webview/siteinfowidget.ui b/src/lib/other/siteinfowidget.ui similarity index 100% rename from src/lib/webview/siteinfowidget.ui rename to src/lib/other/siteinfowidget.ui diff --git a/src/lib/tools/combotabbar.cpp b/src/lib/tabwidget/combotabbar.cpp similarity index 100% rename from src/lib/tools/combotabbar.cpp rename to src/lib/tabwidget/combotabbar.cpp diff --git a/src/lib/tools/combotabbar.h b/src/lib/tabwidget/combotabbar.h similarity index 100% rename from src/lib/tools/combotabbar.h rename to src/lib/tabwidget/combotabbar.h diff --git a/src/lib/webview/tabbar.cpp b/src/lib/tabwidget/tabbar.cpp similarity index 100% rename from src/lib/webview/tabbar.cpp rename to src/lib/tabwidget/tabbar.cpp diff --git a/src/lib/webview/tabbar.h b/src/lib/tabwidget/tabbar.h similarity index 100% rename from src/lib/webview/tabbar.h rename to src/lib/tabwidget/tabbar.h diff --git a/src/lib/webview/tabicon.cpp b/src/lib/tabwidget/tabicon.cpp similarity index 100% rename from src/lib/webview/tabicon.cpp rename to src/lib/tabwidget/tabicon.cpp diff --git a/src/lib/webview/tabicon.h b/src/lib/tabwidget/tabicon.h similarity index 100% rename from src/lib/webview/tabicon.h rename to src/lib/tabwidget/tabicon.h diff --git a/src/lib/webview/tabpreview.cpp b/src/lib/tabwidget/tabpreview.cpp similarity index 100% rename from src/lib/webview/tabpreview.cpp rename to src/lib/tabwidget/tabpreview.cpp diff --git a/src/lib/webview/tabpreview.h b/src/lib/tabwidget/tabpreview.h similarity index 100% rename from src/lib/webview/tabpreview.h rename to src/lib/tabwidget/tabpreview.h diff --git a/src/lib/tools/tabstackedwidget.cpp b/src/lib/tabwidget/tabstackedwidget.cpp similarity index 100% rename from src/lib/tools/tabstackedwidget.cpp rename to src/lib/tabwidget/tabstackedwidget.cpp diff --git a/src/lib/tools/tabstackedwidget.h b/src/lib/tabwidget/tabstackedwidget.h similarity index 100% rename from src/lib/tools/tabstackedwidget.h rename to src/lib/tabwidget/tabstackedwidget.h diff --git a/src/lib/webview/tabwidget.cpp b/src/lib/tabwidget/tabwidget.cpp similarity index 100% rename from src/lib/webview/tabwidget.cpp rename to src/lib/tabwidget/tabwidget.cpp diff --git a/src/lib/webview/tabwidget.h b/src/lib/tabwidget/tabwidget.h similarity index 100% rename from src/lib/webview/tabwidget.h rename to src/lib/tabwidget/tabwidget.h diff --git a/src/lib/webview/javascript/externaljsobject.cpp b/src/lib/webkit/javascript/externaljsobject.cpp similarity index 100% rename from src/lib/webview/javascript/externaljsobject.cpp rename to src/lib/webkit/javascript/externaljsobject.cpp diff --git a/src/lib/webview/javascript/externaljsobject.h b/src/lib/webkit/javascript/externaljsobject.h similarity index 100% rename from src/lib/webview/javascript/externaljsobject.h rename to src/lib/webkit/javascript/externaljsobject.h diff --git a/src/lib/webview/jsalert.ui b/src/lib/webkit/jsalert.ui similarity index 100% rename from src/lib/webview/jsalert.ui rename to src/lib/webkit/jsalert.ui diff --git a/src/lib/webview/jsconfirm.ui b/src/lib/webkit/jsconfirm.ui similarity index 100% rename from src/lib/webview/jsconfirm.ui rename to src/lib/webkit/jsconfirm.ui diff --git a/src/lib/webview/jsprompt.ui b/src/lib/webkit/jsprompt.ui similarity index 100% rename from src/lib/webview/jsprompt.ui rename to src/lib/webkit/jsprompt.ui diff --git a/src/lib/webview/loadrequest.cpp b/src/lib/webkit/loadrequest.cpp similarity index 100% rename from src/lib/webview/loadrequest.cpp rename to src/lib/webkit/loadrequest.cpp diff --git a/src/lib/webview/loadrequest.h b/src/lib/webkit/loadrequest.h similarity index 100% rename from src/lib/webview/loadrequest.h rename to src/lib/webkit/loadrequest.h diff --git a/src/lib/webview/webinspectordockwidget.cpp b/src/lib/webkit/webinspector.cpp similarity index 98% rename from src/lib/webview/webinspectordockwidget.cpp rename to src/lib/webkit/webinspector.cpp index 4379671a6..6ded619d4 100644 --- a/src/lib/webview/webinspectordockwidget.cpp +++ b/src/lib/webkit/webinspector.cpp @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * ============================================================ */ -#include "webinspectordockwidget.h" +#include "webinspector.h" #include "docktitlebarwidget.h" #include "webpage.h" #include "tabbedwebview.h" diff --git a/src/lib/webview/webinspectordockwidget.h b/src/lib/webkit/webinspector.h similarity index 100% rename from src/lib/webview/webinspectordockwidget.h rename to src/lib/webkit/webinspector.h diff --git a/src/lib/webview/webpage.cpp b/src/lib/webkit/webpage.cpp similarity index 100% rename from src/lib/webview/webpage.cpp rename to src/lib/webkit/webpage.cpp diff --git a/src/lib/webview/webpage.h b/src/lib/webkit/webpage.h similarity index 100% rename from src/lib/webview/webpage.h rename to src/lib/webkit/webpage.h diff --git a/src/lib/plugins/webpluginfactory.cpp b/src/lib/webkit/webpluginfactory.cpp similarity index 100% rename from src/lib/plugins/webpluginfactory.cpp rename to src/lib/webkit/webpluginfactory.cpp diff --git a/src/lib/plugins/webpluginfactory.h b/src/lib/webkit/webpluginfactory.h similarity index 100% rename from src/lib/plugins/webpluginfactory.h rename to src/lib/webkit/webpluginfactory.h diff --git a/src/lib/webview/webview.cpp b/src/lib/webkit/webview.cpp similarity index 100% rename from src/lib/webview/webview.cpp rename to src/lib/webkit/webview.cpp diff --git a/src/lib/webview/webview.h b/src/lib/webkit/webview.h similarity index 100% rename from src/lib/webview/webview.h rename to src/lib/webkit/webview.h diff --git a/src/lib/webview/macwebviewscroller.cpp b/src/lib/webtab/macwebviewscroller.cpp similarity index 100% rename from src/lib/webview/macwebviewscroller.cpp rename to src/lib/webtab/macwebviewscroller.cpp diff --git a/src/lib/webview/macwebviewscroller.h b/src/lib/webtab/macwebviewscroller.h similarity index 100% rename from src/lib/webview/macwebviewscroller.h rename to src/lib/webtab/macwebviewscroller.h diff --git a/src/lib/webview/searchtoolbar.cpp b/src/lib/webtab/searchtoolbar.cpp similarity index 100% rename from src/lib/webview/searchtoolbar.cpp rename to src/lib/webtab/searchtoolbar.cpp diff --git a/src/lib/webview/searchtoolbar.h b/src/lib/webtab/searchtoolbar.h similarity index 100% rename from src/lib/webview/searchtoolbar.h rename to src/lib/webtab/searchtoolbar.h diff --git a/src/lib/webview/searchtoolbar.ui b/src/lib/webtab/searchtoolbar.ui similarity index 100% rename from src/lib/webview/searchtoolbar.ui rename to src/lib/webtab/searchtoolbar.ui diff --git a/src/lib/webview/tabbedwebview.cpp b/src/lib/webtab/tabbedwebview.cpp similarity index 100% rename from src/lib/webview/tabbedwebview.cpp rename to src/lib/webtab/tabbedwebview.cpp diff --git a/src/lib/webview/tabbedwebview.h b/src/lib/webtab/tabbedwebview.h similarity index 100% rename from src/lib/webview/tabbedwebview.h rename to src/lib/webtab/tabbedwebview.h diff --git a/src/lib/webview/webtab.cpp b/src/lib/webtab/webtab.cpp similarity index 100% rename from src/lib/webview/webtab.cpp rename to src/lib/webtab/webtab.cpp diff --git a/src/lib/webview/webtab.h b/src/lib/webtab/webtab.h similarity index 100% rename from src/lib/webview/webtab.h rename to src/lib/webtab/webtab.h diff --git a/src/main/main.pro b/src/main/main.pro index cb435c10c..472fff491 100644 --- a/src/main/main.pro +++ b/src/main/main.pro @@ -16,24 +16,22 @@ TEMPLATE = app unix:!contains(DEFINES, "DISABLE_DBUS") QT += dbus -INCLUDEPATH += ../lib/app\ - ../lib/3rdparty\ - ../lib/session\ - ../lib/webview +INCLUDEPATH += ../lib/app \ + ../lib/session \ + ../lib/webtab \ -DEPENDPATH += ../lib/app\ - ../lib/3rdparty\ - ../lib/session\ - ../lib/webview +DEPENDPATH += $$INCLUDEPATH + +SOURCES = main.cpp -SOURCES = main.cpp OTHER_FILES += appicon.rc \ appicon_os2.rc \ - Info.plist + Info.plist \ os2:RC_FILE = appicon_os2.rc win32:RC_FILE = appicon.rc include(../install.pri) +include(../lib/3rdparty/qtsingleapplication/qtsingleapplication.pri) unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}\\$\$ORIGIN diff --git a/src/plugins.pri b/src/plugins.pri index 496a19ae9..d7e9f4c3d 100644 --- a/src/plugins.pri +++ b/src/plugins.pri @@ -1,52 +1,33 @@ include(defines.pri) -INCLUDEPATH += $$PWD/lib/3rdparty\ - $$PWD/lib/app\ - $$PWD/lib/autofill\ - $$PWD/lib/bookmarks\ - $$PWD/lib/cookies\ - $$PWD/lib/session\ - $$PWD/lib/downloads\ - $$PWD/lib/history\ - $$PWD/lib/navigation\ - $$PWD/lib/network\ - $$PWD/lib/other\ - $$PWD/lib/preferences\ - $$PWD/lib/rss\ - $$PWD/lib/tools\ - $$PWD/lib/utils\ - $$PWD/lib/webview\ - $$PWD/lib/plugins\ - $$PWD/lib/sidebar\ - $$PWD/lib/data\ - $$PWD/lib/adblock\ - $$PWD/lib/desktopnotifications\ - $$PWD/lib/opensearch\ - $$PWD/lib/popupwindow\ +INCLUDEPATH += $$PWD/lib/3rdparty \ + $$PWD/lib/adblock \ + $$PWD/lib/app \ + $$PWD/lib/autofill \ + $$PWD/lib/bookmarks \ + $$PWD/lib/cookies \ + $$PWD/lib/downloads \ + $$PWD/lib/history \ + $$PWD/lib/navigation \ + $$PWD/lib/network \ + $$PWD/lib/notifications \ + $$PWD/lib/opensearch \ + $$PWD/lib/other \ + $$PWD/lib/plugins \ + $$PWD/lib/popupwindow \ + $$PWD/lib/preferences \ + $$PWD/lib/rss \ + $$PWD/lib/session \ + $$PWD/lib/sidebar \ + $$PWD/lib/tabwidget \ + $$PWD/lib/tools \ + $$PWD/lib/webkit \ + $$PWD/lib/webtab \ -DEPENDPATH += $$PWD/lib/3rdparty\ - $$PWD/lib/app\ - $$PWD/lib/autofill\ - $$PWD/lib/bookmarks\ - $$PWD/lib/cookies\ - $$PWD/lib/session\ - $$PWD/lib/downloads\ - $$PWD/lib/history\ - $$PWD/lib/navigation\ - $$PWD/lib/network\ - $$PWD/lib/other\ - $$PWD/lib/preferences\ - $$PWD/lib/rss\ - $$PWD/lib/tools\ - $$PWD/lib/utils\ - $$PWD/lib/webview\ - $$PWD/lib/plugins\ - $$PWD/lib/sidebar\ - $$PWD/lib/data\ - $$PWD/lib/adblock\ - $$PWD/lib/desktopnotifications\ - $$PWD/lib/opensearch\ - $$PWD/lib/popupwindow\ +DEPENDPATH += $$INCLUDEPATH \ + $$PWD/lib/data \ + +include(lib/3rdparty/qtsingleapplication/qtsingleapplication.pri) TEMPLATE = lib CONFIG += plugin diff --git a/tests/autotests/autotests.pro b/tests/autotests/autotests.pro index a93989906..6517925fa 100644 --- a/tests/autotests/autotests.pro +++ b/tests/autotests/autotests.pro @@ -33,30 +33,29 @@ MOC_DIR = build RCC_DIR = build UI_DIR = build -INCLUDEPATH += $$PWD/../../src/lib/3rdparty\ - $$PWD/../../src/lib/app\ - $$PWD/../../src/lib/autofill\ - $$PWD/../../src/lib/bookmarks\ - $$PWD/../../src/lib/cookies\ - $$PWD/../../src/lib/session\ - $$PWD/../../src/lib/downloads\ - $$PWD/../../src/lib/history\ - $$PWD/../../src/lib/navigation\ - $$PWD/../../src/lib/network\ - $$PWD/../../src/lib/other\ - $$PWD/../../src/lib/preferences\ - $$PWD/../../src/lib/rss\ - $$PWD/../../src/lib/tools\ - $$PWD/../../src/lib/utils\ - $$PWD/../../src/lib/webview\ - $$PWD/../../src/lib/plugins\ - $$PWD/../../src/lib/sidebar\ - $$PWD/../../src/lib/data\ - $$PWD/../../src/lib/adblock\ - $$PWD/../../src/lib/desktopnotifications\ - $$PWD/../../src/lib/opensearch\ - $$PWD/../../src/lib/bookmarksimport\ - $$PWD/../../src/lib/popupwindow\ +INCLUDEPATH += $$PWD/../../src/lib/3rdparty \ + $$PWD/../../src/lib/adblock \ + $$PWD/../../src/lib/app \ + $$PWD/../../src/lib/autofill \ + $$PWD/../../src/lib/bookmarks \ + $$PWD/../../src/lib/cookies \ + $$PWD/../../src/lib/downloads \ + $$PWD/../../src/lib/history \ + $$PWD/../../src/lib/navigation \ + $$PWD/../../src/lib/network \ + $$PWD/../../src/lib/notifications \ + $$PWD/../../src/lib/opensearch \ + $$PWD/../../src/lib/other \ + $$PWD/../../src/lib/plugins \ + $$PWD/../../src/lib/popupwindow \ + $$PWD/../../src/lib/preferences \ + $$PWD/../../src/lib/rss \ + $$PWD/../../src/lib/session \ + $$PWD/../../src/lib/sidebar \ + $$PWD/../../src/lib/tabwidget \ + $$PWD/../../src/lib/tools \ + $$PWD/../../src/lib/webkit \ + $$PWD/../../src/lib/webtab \ HEADERS += \ qztoolstest.h \