diff --git a/QupZilla.pro b/QupZilla.pro index ac11f4fdb..933b0d434 100644 --- a/QupZilla.pro +++ b/QupZilla.pro @@ -11,6 +11,4 @@ lessThan(QT_VERSION, 4.7) { } TEMPLATE = subdirs -SUBDIRS = src main -build_plugins: SUBDIRS += plugins -CONFIG += ordered +SUBDIRS = src diff --git a/install.pri b/install.pri deleted file mode 100644 index 890bb832c..000000000 --- a/install.pri +++ /dev/null @@ -1,48 +0,0 @@ -mac { - QMAKE_INFO_PLIST = $$PWD/src/Info.plist - ICON = $$PWD/src/data/icons/exeicons/qupzilla.icns - - bundle_target.files += $$PWD/bin/locale - bundle_target.files += $$PWD/bin/themes - build_plugins: bundle_target.files += $$PWD/bin/plugins - bundle_target.path = Contents/Resources - - bundle_target2.files += $$PWD/bin/ - - QMAKE_BUNDLE_DATA += bundle_target -} - -!mac:unix { - target.path = $$binary_folder - - target1.files += $$PWD/bin/locale - target1.files += $$PWD/bin/themes - target1.path = $$data_folder - - target2.files = $$PWD/linux/applications/qupzilla.desktop - target2.path = $$launcher_folder - - target3.files = $$PWD/linux/pixmaps/qupzilla.png - target3.path = $$icon_folder - - ico16.files = $$PWD/linux/hicolor/16x16/apps/qupzilla.png - ico16.path = $$hicolor_folder/16x16/apps - - ico32.files = $$PWD/linux/hicolor/32x32/apps/qupzilla.png - ico32.path = $$hicolor_folder/32x32/apps - - ico48.files = $$PWD/linux/hicolor/48x48/apps/qupzilla.png - ico48.path = $$hicolor_folder/48x48/apps - - ico64.files = $$PWD/linux/hicolor/64x64/apps/qupzilla.png - ico64.path = $$hicolor_folder/64x64/apps - - ico128.files = $$PWD/linux/hicolor/128x128/apps/qupzilla.png - ico128.path = $$hicolor_folder/128x128/apps - - ico256.files = $$PWD/linux/hicolor/256x256/apps/qupzilla.png - ico256.path = $$hicolor_folder/256x256/apps - - INSTALLS += target target1 target2 target3 - INSTALLS += ico16 ico32 ico48 ico64 ico128 ico256 -} diff --git a/main/main.pro b/main/main.pro deleted file mode 100644 index 3065da64c..000000000 --- a/main/main.pro +++ /dev/null @@ -1,18 +0,0 @@ -QT += core gui webkit sql network script -unix: QT += dbus - -TARGET = qupzilla -TEMPLATE = app -LIBS += -L../bin -lqupzilla - -include(../defines.pri) -include(../install.pri) -include(../translations.pri) -include(../src/3rdparty/qtsingleapplication.pri) - -INCLUDEPATH += ../src/app -SOURCES = ../src/main.cpp - -unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_RPATHDIR += $$PWD/../bin - -message(========== Building qupzilla binary ==========) diff --git a/plugins.pri b/plugins.pri deleted file mode 100644 index b56290420..000000000 --- a/plugins.pri +++ /dev/null @@ -1,42 +0,0 @@ -include(defines.pri) - -INCLUDEPATH += $$PWD/src/3rdparty\ - $$PWD/src/app\ - $$PWD/src/autofill\ - $$PWD/src/bookmarks\ - $$PWD/src/cookies\ - $$PWD/src/downloads\ - $$PWD/src/history\ - $$PWD/src/navigation\ - $$PWD/src/network\ - $$PWD/src/other\ - $$PWD/src/preferences\ - $$PWD/src/rss\ - $$PWD/src/tools\ - $$PWD/src/utils\ - $$PWD/src/webview\ - $$PWD/src/plugins\ - $$PWD/src/sidebar\ - $$PWD/src/data\ - $$PWD/src/adblock\ - $$PWD/src/desktopnotifications\ - $$PWD/src/opensearch\ - $$PWD/src/bookmarksimport\ - $$PWD/src/popupwindow\ - -TEMPLATE = lib -CONFIG += plugin -DESTDIR = $$PWD/bin/plugins/ - -OBJECTS_DIR = build -MOC_DIR = build -RCC_DIR = build -UI_DIR = build - -LIBS += -L $$PWD/bin -lqupzilla - -!mac:unix { - target.path = $$library_folder/qupzilla - - INSTALLS += target -} diff --git a/plugins/TestPlugin/TestPlugin.pro b/plugins/TestPlugin/TestPlugin.pro deleted file mode 100644 index 63cae9c98..000000000 --- a/plugins/TestPlugin/TestPlugin.pro +++ /dev/null @@ -1,22 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2011-02-13T10:23:13 -# -#------------------------------------------------- -QT += network webkit sql -TARGET = ExamplePlugin - -SOURCES += testplugin.cpp -HEADERS += testplugin.h -RESOURCES += \ - testplugin.qrc - -TRANSLATIONS += cs_CZ.ts\ - sk_SK.ts\ - sr_BA.ts\ - sr_RS.ts\ - de_DE.ts\ - el_GR.ts\ - id_ID.ts\ - -include(../../plugins.pri) diff --git a/plugins/TestPlugin/cs_CZ.qm b/plugins/TestPlugin/cs_CZ.qm deleted file mode 100644 index dd1626991..000000000 Binary files a/plugins/TestPlugin/cs_CZ.qm and /dev/null differ diff --git a/plugins/TestPlugin/de_DE.qm b/plugins/TestPlugin/de_DE.qm deleted file mode 100644 index 4fa93d9d4..000000000 Binary files a/plugins/TestPlugin/de_DE.qm and /dev/null differ diff --git a/plugins/TestPlugin/el_GR.qm b/plugins/TestPlugin/el_GR.qm deleted file mode 100644 index 51f4b54cc..000000000 Binary files a/plugins/TestPlugin/el_GR.qm and /dev/null differ diff --git a/plugins/TestPlugin/sk_SK.qm b/plugins/TestPlugin/sk_SK.qm deleted file mode 100644 index f50f1a816..000000000 Binary files a/plugins/TestPlugin/sk_SK.qm and /dev/null differ diff --git a/plugins/TestPlugin/sr_BA.qm b/plugins/TestPlugin/sr_BA.qm deleted file mode 100644 index 3e040abd4..000000000 Binary files a/plugins/TestPlugin/sr_BA.qm and /dev/null differ diff --git a/plugins/TestPlugin/sr_RS.qm b/plugins/TestPlugin/sr_RS.qm deleted file mode 100644 index eb9906f6e..000000000 Binary files a/plugins/TestPlugin/sr_RS.qm and /dev/null differ diff --git a/plugins/TestPlugin/testplugin.qrc b/plugins/TestPlugin/testplugin.qrc deleted file mode 100644 index 3021ae886..000000000 --- a/plugins/TestPlugin/testplugin.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - cs_CZ.qm - sk_SK.qm - sr_BA.qm - sr_RS.qm - de_DE.qm - el_GR.qm - - diff --git a/plugins/TestPlugin/zh_CN.qm b/plugins/TestPlugin/zh_CN.qm deleted file mode 100644 index a9a731588..000000000 Binary files a/plugins/TestPlugin/zh_CN.qm and /dev/null differ diff --git a/plugins/TestPlugin/zh_TW.qm b/plugins/TestPlugin/zh_TW.qm deleted file mode 100644 index b11696e1c..000000000 Binary files a/plugins/TestPlugin/zh_TW.qm and /dev/null differ diff --git a/defines.pri b/src/defines.pri similarity index 76% rename from defines.pri rename to src/defines.pri index 007abda5e..458cfd0a1 100644 --- a/defines.pri +++ b/src/defines.pri @@ -1,8 +1,8 @@ -DESTDIR = $$PWD/bin -OBJECTS_DIR = $$PWD/build -MOC_DIR = $$PWD/build -RCC_DIR = $$PWD/build -UI_DIR = $$PWD/build +DESTDIR = $$PWD/../bin +OBJECTS_DIR = $$PWD/../build +MOC_DIR = $$PWD/../build +RCC_DIR = $$PWD/../build +UI_DIR = $$PWD/../build VERSION = 1.1.8 # Please read BUILD information # @@ -53,6 +53,16 @@ equals(d_portable, "true") { DEFINES += PORTABLE_BUILD } DEFINES += USE_DATADIR=\\\"""$$data_folder/"\\\"" #Git revision - rev = $$system(sh $$PWD/scripts/getrevision.sh) + rev = $$system(sh $$PWD/../scripts/getrevision.sh) !equals(rev, ""): DEFINES += GIT_REVISION=\\\"""$$rev"\\\"" } + +isEmpty(QMAKE_LRELEASE) { + win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease + unix { + !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 } + } else { + !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } + } +} diff --git a/src/install.pri b/src/install.pri new file mode 100644 index 000000000..3906e0f18 --- /dev/null +++ b/src/install.pri @@ -0,0 +1,46 @@ +mac { + QMAKE_INFO_PLIST = $$PWD/main/Info.plist + ICON = $$PWD/lib/data/icons/exeicons/qupzilla.icns + + bundle_target.files += $$PWD/../bin/locale + bundle_target.files += $$PWD/../bin/themes + build_plugins: bundle_target.files += $$PWD/../bin/plugins + bundle_target.path = Contents/Resources + + QMAKE_BUNDLE_DATA += bundle_target +} + +!mac:unix { + target.path = $$binary_folder + + target1.files += $$PWD/../bin/locale + target1.files += $$PWD/../bin/themes + target1.path = $$data_folder + + target2.files = $$PWD/../linux/applications/qupzilla.desktop + target2.path = $$launcher_folder + + target3.files = $$PWD/../linux/pixmaps/qupzilla.png + target3.path = $$icon_folder + + ico16.files = $$PWD/../linux/hicolor/16x16/apps/qupzilla.png + ico16.path = $$hicolor_folder/16x16/apps + + ico32.files = $$PWD/../linux/hicolor/32x32/apps/qupzilla.png + ico32.path = $$hicolor_folder/32x32/apps + + ico48.files = $$PWD/../linux/hicolor/48x48/apps/qupzilla.png + ico48.path = $$hicolor_folder/48x48/apps + + ico64.files = $$PWD/../linux/hicolor/64x64/apps/qupzilla.png + ico64.path = $$hicolor_folder/64x64/apps + + ico128.files = $$PWD/../linux/hicolor/128x128/apps/qupzilla.png + ico128.path = $$hicolor_folder/128x128/apps + + ico256.files = $$PWD/../linux/hicolor/256x256/apps/qupzilla.png + ico256.path = $$hicolor_folder/256x256/apps + + INSTALLS += target target1 target2 target3 + INSTALLS += ico16 ico32 ico48 ico64 ico128 ico256 +} diff --git a/src/3rdparty/ecwin7.cpp b/src/lib/3rdparty/ecwin7.cpp similarity index 100% rename from src/3rdparty/ecwin7.cpp rename to src/lib/3rdparty/ecwin7.cpp diff --git a/src/3rdparty/ecwin7.h b/src/lib/3rdparty/ecwin7.h similarity index 100% rename from src/3rdparty/ecwin7.h rename to src/lib/3rdparty/ecwin7.h diff --git a/src/3rdparty/fancytabwidget.cpp b/src/lib/3rdparty/fancytabwidget.cpp similarity index 100% rename from src/3rdparty/fancytabwidget.cpp rename to src/lib/3rdparty/fancytabwidget.cpp diff --git a/src/3rdparty/fancytabwidget.h b/src/lib/3rdparty/fancytabwidget.h similarity index 100% rename from src/3rdparty/fancytabwidget.h rename to src/lib/3rdparty/fancytabwidget.h diff --git a/src/3rdparty/lineedit.cpp b/src/lib/3rdparty/lineedit.cpp similarity index 100% rename from src/3rdparty/lineedit.cpp rename to src/lib/3rdparty/lineedit.cpp diff --git a/src/3rdparty/lineedit.h b/src/lib/3rdparty/lineedit.h similarity index 100% rename from src/3rdparty/lineedit.h rename to src/lib/3rdparty/lineedit.h diff --git a/src/3rdparty/msvc2008.h b/src/lib/3rdparty/msvc2008.h similarity index 100% rename from src/3rdparty/msvc2008.h rename to src/lib/3rdparty/msvc2008.h diff --git a/src/3rdparty/qtlocalpeer.cpp b/src/lib/3rdparty/qtlocalpeer.cpp similarity index 100% rename from src/3rdparty/qtlocalpeer.cpp rename to src/lib/3rdparty/qtlocalpeer.cpp diff --git a/src/3rdparty/qtlocalpeer.h b/src/lib/3rdparty/qtlocalpeer.h similarity index 100% rename from src/3rdparty/qtlocalpeer.h rename to src/lib/3rdparty/qtlocalpeer.h diff --git a/src/3rdparty/qtlockedfile.cpp b/src/lib/3rdparty/qtlockedfile.cpp similarity index 100% rename from src/3rdparty/qtlockedfile.cpp rename to src/lib/3rdparty/qtlockedfile.cpp diff --git a/src/3rdparty/qtlockedfile.h b/src/lib/3rdparty/qtlockedfile.h similarity index 100% rename from src/3rdparty/qtlockedfile.h rename to src/lib/3rdparty/qtlockedfile.h diff --git a/src/3rdparty/qtlockedfile_unix.cpp b/src/lib/3rdparty/qtlockedfile_unix.cpp similarity index 100% rename from src/3rdparty/qtlockedfile_unix.cpp rename to src/lib/3rdparty/qtlockedfile_unix.cpp diff --git a/src/3rdparty/qtlockedfile_win.cpp b/src/lib/3rdparty/qtlockedfile_win.cpp similarity index 100% rename from src/3rdparty/qtlockedfile_win.cpp rename to src/lib/3rdparty/qtlockedfile_win.cpp diff --git a/src/3rdparty/qtsingleapplication.cpp b/src/lib/3rdparty/qtsingleapplication.cpp similarity index 100% rename from src/3rdparty/qtsingleapplication.cpp rename to src/lib/3rdparty/qtsingleapplication.cpp diff --git a/src/3rdparty/qtsingleapplication.h b/src/lib/3rdparty/qtsingleapplication.h similarity index 100% rename from src/3rdparty/qtsingleapplication.h rename to src/lib/3rdparty/qtsingleapplication.h diff --git a/src/3rdparty/qtsingleapplication.pri b/src/lib/3rdparty/qtsingleapplication.pri similarity index 100% rename from src/3rdparty/qtsingleapplication.pri rename to src/lib/3rdparty/qtsingleapplication.pri diff --git a/src/3rdparty/qtwin.cpp b/src/lib/3rdparty/qtwin.cpp similarity index 100% rename from src/3rdparty/qtwin.cpp rename to src/lib/3rdparty/qtwin.cpp diff --git a/src/3rdparty/qtwin.h b/src/lib/3rdparty/qtwin.h similarity index 100% rename from src/3rdparty/qtwin.h rename to src/lib/3rdparty/qtwin.h diff --git a/src/3rdparty/squeezelabelv1.cpp b/src/lib/3rdparty/squeezelabelv1.cpp similarity index 100% rename from src/3rdparty/squeezelabelv1.cpp rename to src/lib/3rdparty/squeezelabelv1.cpp diff --git a/src/3rdparty/squeezelabelv1.h b/src/lib/3rdparty/squeezelabelv1.h similarity index 100% rename from src/3rdparty/squeezelabelv1.h rename to src/lib/3rdparty/squeezelabelv1.h diff --git a/src/3rdparty/squeezelabelv2.cpp b/src/lib/3rdparty/squeezelabelv2.cpp similarity index 100% rename from src/3rdparty/squeezelabelv2.cpp rename to src/lib/3rdparty/squeezelabelv2.cpp diff --git a/src/3rdparty/squeezelabelv2.h b/src/lib/3rdparty/squeezelabelv2.h similarity index 100% rename from src/3rdparty/squeezelabelv2.h rename to src/lib/3rdparty/squeezelabelv2.h diff --git a/src/3rdparty/stylehelper.cpp b/src/lib/3rdparty/stylehelper.cpp similarity index 100% rename from src/3rdparty/stylehelper.cpp rename to src/lib/3rdparty/stylehelper.cpp diff --git a/src/3rdparty/stylehelper.h b/src/lib/3rdparty/stylehelper.h similarity index 100% rename from src/3rdparty/stylehelper.h rename to src/lib/3rdparty/stylehelper.h diff --git a/src/adblock/adblockblockednetworkreply.cpp b/src/lib/adblock/adblockblockednetworkreply.cpp similarity index 100% rename from src/adblock/adblockblockednetworkreply.cpp rename to src/lib/adblock/adblockblockednetworkreply.cpp diff --git a/src/adblock/adblockblockednetworkreply.h b/src/lib/adblock/adblockblockednetworkreply.h similarity index 100% rename from src/adblock/adblockblockednetworkreply.h rename to src/lib/adblock/adblockblockednetworkreply.h diff --git a/src/adblock/adblockdialog.cpp b/src/lib/adblock/adblockdialog.cpp similarity index 100% rename from src/adblock/adblockdialog.cpp rename to src/lib/adblock/adblockdialog.cpp diff --git a/src/adblock/adblockdialog.h b/src/lib/adblock/adblockdialog.h similarity index 100% rename from src/adblock/adblockdialog.h rename to src/lib/adblock/adblockdialog.h diff --git a/src/adblock/adblockdialog.ui b/src/lib/adblock/adblockdialog.ui similarity index 100% rename from src/adblock/adblockdialog.ui rename to src/lib/adblock/adblockdialog.ui diff --git a/src/adblock/adblockicon.cpp b/src/lib/adblock/adblockicon.cpp similarity index 100% rename from src/adblock/adblockicon.cpp rename to src/lib/adblock/adblockicon.cpp diff --git a/src/adblock/adblockicon.h b/src/lib/adblock/adblockicon.h similarity index 100% rename from src/adblock/adblockicon.h rename to src/lib/adblock/adblockicon.h diff --git a/src/adblock/adblockmanager.cpp b/src/lib/adblock/adblockmanager.cpp similarity index 100% rename from src/adblock/adblockmanager.cpp rename to src/lib/adblock/adblockmanager.cpp diff --git a/src/adblock/adblockmanager.h b/src/lib/adblock/adblockmanager.h similarity index 100% rename from src/adblock/adblockmanager.h rename to src/lib/adblock/adblockmanager.h diff --git a/src/adblock/adblocknetwork.cpp b/src/lib/adblock/adblocknetwork.cpp similarity index 100% rename from src/adblock/adblocknetwork.cpp rename to src/lib/adblock/adblocknetwork.cpp diff --git a/src/adblock/adblocknetwork.h b/src/lib/adblock/adblocknetwork.h similarity index 100% rename from src/adblock/adblocknetwork.h rename to src/lib/adblock/adblocknetwork.h diff --git a/src/adblock/adblockpage.cpp b/src/lib/adblock/adblockpage.cpp similarity index 100% rename from src/adblock/adblockpage.cpp rename to src/lib/adblock/adblockpage.cpp diff --git a/src/adblock/adblockpage.h b/src/lib/adblock/adblockpage.h similarity index 100% rename from src/adblock/adblockpage.h rename to src/lib/adblock/adblockpage.h diff --git a/src/adblock/adblockrule.cpp b/src/lib/adblock/adblockrule.cpp similarity index 100% rename from src/adblock/adblockrule.cpp rename to src/lib/adblock/adblockrule.cpp diff --git a/src/adblock/adblockrule.h b/src/lib/adblock/adblockrule.h similarity index 100% rename from src/adblock/adblockrule.h rename to src/lib/adblock/adblockrule.h diff --git a/src/adblock/adblocksubscription.cpp b/src/lib/adblock/adblocksubscription.cpp similarity index 100% rename from src/adblock/adblocksubscription.cpp rename to src/lib/adblock/adblocksubscription.cpp diff --git a/src/adblock/adblocksubscription.h b/src/lib/adblock/adblocksubscription.h similarity index 100% rename from src/adblock/adblocksubscription.h rename to src/lib/adblock/adblocksubscription.h diff --git a/src/app/autosaver.cpp b/src/lib/app/autosaver.cpp similarity index 100% rename from src/app/autosaver.cpp rename to src/lib/app/autosaver.cpp diff --git a/src/app/autosaver.h b/src/lib/app/autosaver.h similarity index 100% rename from src/app/autosaver.h rename to src/lib/app/autosaver.h diff --git a/src/app/commandlineoptions.cpp b/src/lib/app/commandlineoptions.cpp similarity index 100% rename from src/app/commandlineoptions.cpp rename to src/lib/app/commandlineoptions.cpp diff --git a/src/app/commandlineoptions.h b/src/lib/app/commandlineoptions.h similarity index 100% rename from src/app/commandlineoptions.h rename to src/lib/app/commandlineoptions.h diff --git a/src/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp similarity index 100% rename from src/app/mainapplication.cpp rename to src/lib/app/mainapplication.cpp diff --git a/src/app/mainapplication.h b/src/lib/app/mainapplication.h similarity index 100% rename from src/app/mainapplication.h rename to src/lib/app/mainapplication.h diff --git a/src/app/profileupdater.cpp b/src/lib/app/profileupdater.cpp similarity index 100% rename from src/app/profileupdater.cpp rename to src/lib/app/profileupdater.cpp diff --git a/src/app/profileupdater.h b/src/lib/app/profileupdater.h similarity index 100% rename from src/app/profileupdater.h rename to src/lib/app/profileupdater.h diff --git a/src/app/proxystyle.cpp b/src/lib/app/proxystyle.cpp similarity index 100% rename from src/app/proxystyle.cpp rename to src/lib/app/proxystyle.cpp diff --git a/src/app/proxystyle.h b/src/lib/app/proxystyle.h similarity index 100% rename from src/app/proxystyle.h rename to src/lib/app/proxystyle.h diff --git a/src/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp similarity index 100% rename from src/app/qupzilla.cpp rename to src/lib/app/qupzilla.cpp diff --git a/src/app/qupzilla.h b/src/lib/app/qupzilla.h similarity index 100% rename from src/app/qupzilla.h rename to src/lib/app/qupzilla.h diff --git a/src/app/qz_namespace.h b/src/lib/app/qz_namespace.h similarity index 100% rename from src/app/qz_namespace.h rename to src/lib/app/qz_namespace.h diff --git a/src/app/settings.cpp b/src/lib/app/settings.cpp similarity index 100% rename from src/app/settings.cpp rename to src/lib/app/settings.cpp diff --git a/src/app/settings.h b/src/lib/app/settings.h similarity index 100% rename from src/app/settings.h rename to src/lib/app/settings.h diff --git a/src/autofill/autofillmodel.cpp b/src/lib/autofill/autofillmodel.cpp similarity index 100% rename from src/autofill/autofillmodel.cpp rename to src/lib/autofill/autofillmodel.cpp diff --git a/src/autofill/autofillmodel.h b/src/lib/autofill/autofillmodel.h similarity index 100% rename from src/autofill/autofillmodel.h rename to src/lib/autofill/autofillmodel.h diff --git a/src/autofill/autofillnotification.cpp b/src/lib/autofill/autofillnotification.cpp similarity index 100% rename from src/autofill/autofillnotification.cpp rename to src/lib/autofill/autofillnotification.cpp diff --git a/src/autofill/autofillnotification.h b/src/lib/autofill/autofillnotification.h similarity index 100% rename from src/autofill/autofillnotification.h rename to src/lib/autofill/autofillnotification.h diff --git a/src/autofill/autofillnotification.ui b/src/lib/autofill/autofillnotification.ui similarity index 100% rename from src/autofill/autofillnotification.ui rename to src/lib/autofill/autofillnotification.ui diff --git a/src/bookmarks/bookmarkicon.cpp b/src/lib/bookmarks/bookmarkicon.cpp similarity index 100% rename from src/bookmarks/bookmarkicon.cpp rename to src/lib/bookmarks/bookmarkicon.cpp diff --git a/src/bookmarks/bookmarkicon.h b/src/lib/bookmarks/bookmarkicon.h similarity index 100% rename from src/bookmarks/bookmarkicon.h rename to src/lib/bookmarks/bookmarkicon.h diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/lib/bookmarks/bookmarksmanager.cpp similarity index 100% rename from src/bookmarks/bookmarksmanager.cpp rename to src/lib/bookmarks/bookmarksmanager.cpp diff --git a/src/bookmarks/bookmarksmanager.h b/src/lib/bookmarks/bookmarksmanager.h similarity index 100% rename from src/bookmarks/bookmarksmanager.h rename to src/lib/bookmarks/bookmarksmanager.h diff --git a/src/bookmarks/bookmarksmanager.ui b/src/lib/bookmarks/bookmarksmanager.ui similarity index 100% rename from src/bookmarks/bookmarksmanager.ui rename to src/lib/bookmarks/bookmarksmanager.ui diff --git a/src/bookmarks/bookmarksmodel.cpp b/src/lib/bookmarks/bookmarksmodel.cpp similarity index 100% rename from src/bookmarks/bookmarksmodel.cpp rename to src/lib/bookmarks/bookmarksmodel.cpp diff --git a/src/bookmarks/bookmarksmodel.h b/src/lib/bookmarks/bookmarksmodel.h similarity index 100% rename from src/bookmarks/bookmarksmodel.h rename to src/lib/bookmarks/bookmarksmodel.h diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/lib/bookmarks/bookmarkstoolbar.cpp similarity index 100% rename from src/bookmarks/bookmarkstoolbar.cpp rename to src/lib/bookmarks/bookmarkstoolbar.cpp diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/lib/bookmarks/bookmarkstoolbar.h similarity index 100% rename from src/bookmarks/bookmarkstoolbar.h rename to src/lib/bookmarks/bookmarkstoolbar.h diff --git a/src/bookmarks/bookmarkswidget.cpp b/src/lib/bookmarks/bookmarkswidget.cpp similarity index 100% rename from src/bookmarks/bookmarkswidget.cpp rename to src/lib/bookmarks/bookmarkswidget.cpp diff --git a/src/bookmarks/bookmarkswidget.h b/src/lib/bookmarks/bookmarkswidget.h similarity index 100% rename from src/bookmarks/bookmarkswidget.h rename to src/lib/bookmarks/bookmarkswidget.h diff --git a/src/bookmarks/bookmarkswidget.ui b/src/lib/bookmarks/bookmarkswidget.ui similarity index 100% rename from src/bookmarks/bookmarkswidget.ui rename to src/lib/bookmarks/bookmarkswidget.ui diff --git a/src/bookmarksimport/bookmarksimportdialog.cpp b/src/lib/bookmarksimport/bookmarksimportdialog.cpp similarity index 100% rename from src/bookmarksimport/bookmarksimportdialog.cpp rename to src/lib/bookmarksimport/bookmarksimportdialog.cpp diff --git a/src/bookmarksimport/bookmarksimportdialog.h b/src/lib/bookmarksimport/bookmarksimportdialog.h similarity index 100% rename from src/bookmarksimport/bookmarksimportdialog.h rename to src/lib/bookmarksimport/bookmarksimportdialog.h diff --git a/src/bookmarksimport/bookmarksimportdialog.ui b/src/lib/bookmarksimport/bookmarksimportdialog.ui similarity index 100% rename from src/bookmarksimport/bookmarksimportdialog.ui rename to src/lib/bookmarksimport/bookmarksimportdialog.ui diff --git a/src/bookmarksimport/chromeimporter.cpp b/src/lib/bookmarksimport/chromeimporter.cpp similarity index 100% rename from src/bookmarksimport/chromeimporter.cpp rename to src/lib/bookmarksimport/chromeimporter.cpp diff --git a/src/bookmarksimport/chromeimporter.h b/src/lib/bookmarksimport/chromeimporter.h similarity index 100% rename from src/bookmarksimport/chromeimporter.h rename to src/lib/bookmarksimport/chromeimporter.h diff --git a/src/bookmarksimport/firefoximporter.cpp b/src/lib/bookmarksimport/firefoximporter.cpp similarity index 100% rename from src/bookmarksimport/firefoximporter.cpp rename to src/lib/bookmarksimport/firefoximporter.cpp diff --git a/src/bookmarksimport/firefoximporter.h b/src/lib/bookmarksimport/firefoximporter.h similarity index 100% rename from src/bookmarksimport/firefoximporter.h rename to src/lib/bookmarksimport/firefoximporter.h diff --git a/src/bookmarksimport/htmlimporter.cpp b/src/lib/bookmarksimport/htmlimporter.cpp similarity index 100% rename from src/bookmarksimport/htmlimporter.cpp rename to src/lib/bookmarksimport/htmlimporter.cpp diff --git a/src/bookmarksimport/htmlimporter.h b/src/lib/bookmarksimport/htmlimporter.h similarity index 100% rename from src/bookmarksimport/htmlimporter.h rename to src/lib/bookmarksimport/htmlimporter.h diff --git a/src/bookmarksimport/operaimporter.cpp b/src/lib/bookmarksimport/operaimporter.cpp similarity index 100% rename from src/bookmarksimport/operaimporter.cpp rename to src/lib/bookmarksimport/operaimporter.cpp diff --git a/src/bookmarksimport/operaimporter.h b/src/lib/bookmarksimport/operaimporter.h similarity index 100% rename from src/bookmarksimport/operaimporter.h rename to src/lib/bookmarksimport/operaimporter.h diff --git a/src/cookies/cookiejar.cpp b/src/lib/cookies/cookiejar.cpp similarity index 100% rename from src/cookies/cookiejar.cpp rename to src/lib/cookies/cookiejar.cpp diff --git a/src/cookies/cookiejar.h b/src/lib/cookies/cookiejar.h similarity index 100% rename from src/cookies/cookiejar.h rename to src/lib/cookies/cookiejar.h diff --git a/src/cookies/cookiemanager.cpp b/src/lib/cookies/cookiemanager.cpp similarity index 100% rename from src/cookies/cookiemanager.cpp rename to src/lib/cookies/cookiemanager.cpp diff --git a/src/cookies/cookiemanager.h b/src/lib/cookies/cookiemanager.h similarity index 100% rename from src/cookies/cookiemanager.h rename to src/lib/cookies/cookiemanager.h diff --git a/src/cookies/cookiemanager.ui b/src/lib/cookies/cookiemanager.ui similarity index 100% rename from src/cookies/cookiemanager.ui rename to src/lib/cookies/cookiemanager.ui diff --git a/src/data/data.qrc b/src/lib/data/data.qrc similarity index 100% rename from src/data/data.qrc rename to src/lib/data/data.qrc diff --git a/src/data/data/browsedata.db b/src/lib/data/data/browsedata.db similarity index 100% rename from src/data/data/browsedata.db rename to src/lib/data/data/browsedata.db diff --git a/src/data/data/bundle_version b/src/lib/data/data/bundle_version similarity index 100% rename from src/data/data/bundle_version rename to src/lib/data/data/bundle_version diff --git a/src/data/data/ca-bundle.crt b/src/lib/data/data/ca-bundle.crt similarity index 100% rename from src/data/data/ca-bundle.crt rename to src/lib/data/data/ca-bundle.crt diff --git a/src/data/data/profiles.ini b/src/lib/data/data/profiles.ini similarity index 100% rename from src/data/data/profiles.ini rename to src/lib/data/data/profiles.ini diff --git a/src/data/html.qrc b/src/lib/data/html.qrc similarity index 100% rename from src/data/html.qrc rename to src/lib/data/html.qrc diff --git a/src/data/html/about.html b/src/lib/data/html/about.html similarity index 100% rename from src/data/html/about.html rename to src/lib/data/html/about.html diff --git a/src/data/html/adblockPage.html b/src/lib/data/html/adblockPage.html similarity index 100% rename from src/data/html/adblockPage.html rename to src/lib/data/html/adblockPage.html diff --git a/src/data/html/adblock_big.png b/src/lib/data/html/adblock_big.png similarity index 100% rename from src/data/html/adblock_big.png rename to src/lib/data/html/adblock_big.png diff --git a/src/data/html/box-border-small.png b/src/lib/data/html/box-border-small.png similarity index 100% rename from src/data/html/box-border-small.png rename to src/lib/data/html/box-border-small.png diff --git a/src/data/html/box-border.png b/src/lib/data/html/box-border.png similarity index 100% rename from src/data/html/box-border.png rename to src/lib/data/html/box-border.png diff --git a/src/data/html/broken-page.png b/src/lib/data/html/broken-page.png similarity index 100% rename from src/data/html/broken-page.png rename to src/lib/data/html/broken-page.png diff --git a/src/data/html/close.png b/src/lib/data/html/close.png similarity index 100% rename from src/data/html/close.png rename to src/lib/data/html/close.png diff --git a/src/data/html/config.html b/src/lib/data/html/config.html similarity index 100% rename from src/data/html/config.html rename to src/lib/data/html/config.html diff --git a/src/data/html/copyright b/src/lib/data/html/copyright similarity index 100% rename from src/data/html/copyright rename to src/lib/data/html/copyright diff --git a/src/data/html/edit.png b/src/lib/data/html/edit.png similarity index 100% rename from src/data/html/edit.png rename to src/lib/data/html/edit.png diff --git a/src/data/html/errorPage.html b/src/lib/data/html/errorPage.html similarity index 100% rename from src/data/html/errorPage.html rename to src/lib/data/html/errorPage.html diff --git a/src/data/html/info.png b/src/lib/data/html/info.png similarity index 100% rename from src/data/html/info.png rename to src/lib/data/html/info.png diff --git a/src/data/html/jquery-ui.js b/src/lib/data/html/jquery-ui.js similarity index 100% rename from src/data/html/jquery-ui.js rename to src/lib/data/html/jquery-ui.js diff --git a/src/data/html/jquery.js b/src/lib/data/html/jquery.js similarity index 100% rename from src/data/html/jquery.js rename to src/lib/data/html/jquery.js diff --git a/src/data/html/loading.gif b/src/lib/data/html/loading.gif similarity index 100% rename from src/data/html/loading.gif rename to src/lib/data/html/loading.gif diff --git a/src/data/html/plus.png b/src/lib/data/html/plus.png similarity index 100% rename from src/data/html/plus.png rename to src/lib/data/html/plus.png diff --git a/src/data/html/qupzilla.ico b/src/lib/data/html/qupzilla.ico similarity index 100% rename from src/data/html/qupzilla.ico rename to src/lib/data/html/qupzilla.ico diff --git a/src/data/html/reload.png b/src/lib/data/html/reload.png similarity index 100% rename from src/data/html/reload.png rename to src/lib/data/html/reload.png diff --git a/src/data/html/reportbug.html b/src/lib/data/html/reportbug.html similarity index 100% rename from src/data/html/reportbug.html rename to src/lib/data/html/reportbug.html diff --git a/src/data/html/setting.png b/src/lib/data/html/setting.png similarity index 100% rename from src/data/html/setting.png rename to src/lib/data/html/setting.png diff --git a/src/data/html/speeddial.html b/src/lib/data/html/speeddial.html similarity index 100% rename from src/data/html/speeddial.html rename to src/lib/data/html/speeddial.html diff --git a/src/data/html/start.html b/src/lib/data/html/start.html similarity index 100% rename from src/data/html/start.html rename to src/lib/data/html/start.html diff --git a/src/data/icons.qrc b/src/lib/data/icons.qrc similarity index 100% rename from src/data/icons.qrc rename to src/lib/data/icons.qrc diff --git a/src/data/icons/browsers/chrome.png b/src/lib/data/icons/browsers/chrome.png similarity index 100% rename from src/data/icons/browsers/chrome.png rename to src/lib/data/icons/browsers/chrome.png diff --git a/src/data/icons/browsers/firefox.png b/src/lib/data/icons/browsers/firefox.png similarity index 100% rename from src/data/icons/browsers/firefox.png rename to src/lib/data/icons/browsers/firefox.png diff --git a/src/data/icons/browsers/html.png b/src/lib/data/icons/browsers/html.png similarity index 100% rename from src/data/icons/browsers/html.png rename to src/lib/data/icons/browsers/html.png diff --git a/src/data/icons/browsers/opera.png b/src/lib/data/icons/browsers/opera.png similarity index 100% rename from src/data/icons/browsers/opera.png rename to src/lib/data/icons/browsers/opera.png diff --git a/src/data/icons/exeicons/page.ico b/src/lib/data/icons/exeicons/page.ico similarity index 100% rename from src/data/icons/exeicons/page.ico rename to src/lib/data/icons/exeicons/page.ico diff --git a/src/data/icons/exeicons/page16.png b/src/lib/data/icons/exeicons/page16.png similarity index 100% rename from src/data/icons/exeicons/page16.png rename to src/lib/data/icons/exeicons/page16.png diff --git a/src/data/icons/exeicons/page32.png b/src/lib/data/icons/exeicons/page32.png similarity index 100% rename from src/data/icons/exeicons/page32.png rename to src/lib/data/icons/exeicons/page32.png diff --git a/src/data/icons/exeicons/page48.png b/src/lib/data/icons/exeicons/page48.png similarity index 100% rename from src/data/icons/exeicons/page48.png rename to src/lib/data/icons/exeicons/page48.png diff --git a/src/data/icons/exeicons/page_os2.ico b/src/lib/data/icons/exeicons/page_os2.ico similarity index 100% rename from src/data/icons/exeicons/page_os2.ico rename to src/lib/data/icons/exeicons/page_os2.ico diff --git a/src/data/icons/exeicons/qupzilla-window.png b/src/lib/data/icons/exeicons/qupzilla-window.png similarity index 100% rename from src/data/icons/exeicons/qupzilla-window.png rename to src/lib/data/icons/exeicons/qupzilla-window.png diff --git a/src/data/icons/exeicons/qupzilla.icns b/src/lib/data/icons/exeicons/qupzilla.icns similarity index 100% rename from src/data/icons/exeicons/qupzilla.icns rename to src/lib/data/icons/exeicons/qupzilla.icns diff --git a/src/data/icons/exeicons/qupzilla.ico b/src/lib/data/icons/exeicons/qupzilla.ico similarity index 100% rename from src/data/icons/exeicons/qupzilla.ico rename to src/lib/data/icons/exeicons/qupzilla.ico diff --git a/src/data/icons/exeicons/qupzilla_os2.ico b/src/lib/data/icons/exeicons/qupzilla_os2.ico similarity index 100% rename from src/data/icons/exeicons/qupzilla_os2.ico rename to src/lib/data/icons/exeicons/qupzilla_os2.ico diff --git a/src/data/icons/faenza/back.png b/src/lib/data/icons/faenza/back.png similarity index 100% rename from src/data/icons/faenza/back.png rename to src/lib/data/icons/faenza/back.png diff --git a/src/data/icons/faenza/close.png b/src/lib/data/icons/faenza/close.png similarity index 100% rename from src/data/icons/faenza/close.png rename to src/lib/data/icons/faenza/close.png diff --git a/src/data/icons/faenza/forward.png b/src/lib/data/icons/faenza/forward.png similarity index 100% rename from src/data/icons/faenza/forward.png rename to src/lib/data/icons/faenza/forward.png diff --git a/src/data/icons/faenza/go-next.png b/src/lib/data/icons/faenza/go-next.png similarity index 100% rename from src/data/icons/faenza/go-next.png rename to src/lib/data/icons/faenza/go-next.png diff --git a/src/data/icons/faenza/go-previous.png b/src/lib/data/icons/faenza/go-previous.png similarity index 100% rename from src/data/icons/faenza/go-previous.png rename to src/lib/data/icons/faenza/go-previous.png diff --git a/src/data/icons/faenza/home.png b/src/lib/data/icons/faenza/home.png similarity index 100% rename from src/data/icons/faenza/home.png rename to src/lib/data/icons/faenza/home.png diff --git a/src/data/icons/faenza/list-remove.png b/src/lib/data/icons/faenza/list-remove.png similarity index 100% rename from src/data/icons/faenza/list-remove.png rename to src/lib/data/icons/faenza/list-remove.png diff --git a/src/data/icons/faenza/reload.png b/src/lib/data/icons/faenza/reload.png similarity index 100% rename from src/data/icons/faenza/reload.png rename to src/lib/data/icons/faenza/reload.png diff --git a/src/data/icons/faenza/settings.png b/src/lib/data/icons/faenza/settings.png similarity index 100% rename from src/data/icons/faenza/settings.png rename to src/lib/data/icons/faenza/settings.png diff --git a/src/data/icons/faenza/source.png b/src/lib/data/icons/faenza/source.png similarity index 100% rename from src/data/icons/faenza/source.png rename to src/lib/data/icons/faenza/source.png diff --git a/src/data/icons/faenza/stop.png b/src/lib/data/icons/faenza/stop.png similarity index 100% rename from src/data/icons/faenza/stop.png rename to src/lib/data/icons/faenza/stop.png diff --git a/src/data/icons/faenza/user-bookmarks.png b/src/lib/data/icons/faenza/user-bookmarks.png similarity index 100% rename from src/data/icons/faenza/user-bookmarks.png rename to src/lib/data/icons/faenza/user-bookmarks.png diff --git a/src/data/icons/locationbar/accept.png b/src/lib/data/icons/locationbar/accept.png similarity index 100% rename from src/data/icons/locationbar/accept.png rename to src/lib/data/icons/locationbar/accept.png diff --git a/src/data/icons/locationbar/privatebrowsing.png b/src/lib/data/icons/locationbar/privatebrowsing.png similarity index 100% rename from src/data/icons/locationbar/privatebrowsing.png rename to src/lib/data/icons/locationbar/privatebrowsing.png diff --git a/src/data/icons/locationbar/unknownpage.png b/src/lib/data/icons/locationbar/unknownpage.png similarity index 100% rename from src/data/icons/locationbar/unknownpage.png rename to src/lib/data/icons/locationbar/unknownpage.png diff --git a/src/data/icons/locationbar/warning.png b/src/lib/data/icons/locationbar/warning.png similarity index 100% rename from src/data/icons/locationbar/warning.png rename to src/lib/data/icons/locationbar/warning.png diff --git a/src/data/icons/menu/copy.png b/src/lib/data/icons/menu/copy.png similarity index 100% rename from src/data/icons/menu/copy.png rename to src/lib/data/icons/menu/copy.png diff --git a/src/data/icons/menu/dot.png b/src/lib/data/icons/menu/dot.png similarity index 100% rename from src/data/icons/menu/dot.png rename to src/lib/data/icons/menu/dot.png diff --git a/src/data/icons/menu/duck.png b/src/lib/data/icons/menu/duck.png similarity index 100% rename from src/data/icons/menu/duck.png rename to src/lib/data/icons/menu/duck.png diff --git a/src/data/icons/menu/gear.png b/src/lib/data/icons/menu/gear.png similarity index 100% rename from src/data/icons/menu/gear.png rename to src/lib/data/icons/menu/gear.png diff --git a/src/data/icons/menu/google.png b/src/lib/data/icons/menu/google.png similarity index 100% rename from src/data/icons/menu/google.png rename to src/lib/data/icons/menu/google.png diff --git a/src/data/icons/menu/history.png b/src/lib/data/icons/menu/history.png similarity index 100% rename from src/data/icons/menu/history.png rename to src/lib/data/icons/menu/history.png diff --git a/src/data/icons/menu/history_entry.png b/src/lib/data/icons/menu/history_entry.png similarity index 100% rename from src/data/icons/menu/history_entry.png rename to src/lib/data/icons/menu/history_entry.png diff --git a/src/data/icons/menu/popup.png b/src/lib/data/icons/menu/popup.png similarity index 100% rename from src/data/icons/menu/popup.png rename to src/lib/data/icons/menu/popup.png diff --git a/src/data/icons/menu/qt.png b/src/lib/data/icons/menu/qt.png similarity index 100% rename from src/data/icons/menu/qt.png rename to src/lib/data/icons/menu/qt.png diff --git a/src/data/icons/menu/rss.png b/src/lib/data/icons/menu/rss.png similarity index 100% rename from src/data/icons/menu/rss.png rename to src/lib/data/icons/menu/rss.png diff --git a/src/data/icons/menu/search-icon.png b/src/lib/data/icons/menu/search-icon.png similarity index 100% rename from src/data/icons/menu/search-icon.png rename to src/lib/data/icons/menu/search-icon.png diff --git a/src/data/icons/menu/translate.png b/src/lib/data/icons/menu/translate.png similarity index 100% rename from src/data/icons/menu/translate.png rename to src/lib/data/icons/menu/translate.png diff --git a/src/data/icons/menu/wikipedia.png b/src/lib/data/icons/menu/wikipedia.png similarity index 100% rename from src/data/icons/menu/wikipedia.png rename to src/lib/data/icons/menu/wikipedia.png diff --git a/src/data/icons/menu/youtube.png b/src/lib/data/icons/menu/youtube.png similarity index 100% rename from src/data/icons/menu/youtube.png rename to src/lib/data/icons/menu/youtube.png diff --git a/src/data/icons/notifications/download.png b/src/lib/data/icons/notifications/download.png similarity index 100% rename from src/data/icons/notifications/download.png rename to src/lib/data/icons/notifications/download.png diff --git a/src/data/icons/other/about.png b/src/lib/data/icons/other/about.png similarity index 100% rename from src/data/icons/other/about.png rename to src/lib/data/icons/other/about.png diff --git a/src/data/icons/other/adblock-disabled.png b/src/lib/data/icons/other/adblock-disabled.png similarity index 100% rename from src/data/icons/other/adblock-disabled.png rename to src/lib/data/icons/other/adblock-disabled.png diff --git a/src/data/icons/other/adblock.png b/src/lib/data/icons/other/adblock.png similarity index 100% rename from src/data/icons/other/adblock.png rename to src/lib/data/icons/other/adblock.png diff --git a/src/data/icons/other/background.png b/src/lib/data/icons/other/background.png similarity index 100% rename from src/data/icons/other/background.png rename to src/lib/data/icons/other/background.png diff --git a/src/data/icons/other/bighistory.png b/src/lib/data/icons/other/bighistory.png similarity index 100% rename from src/data/icons/other/bighistory.png rename to src/lib/data/icons/other/bighistory.png diff --git a/src/data/icons/other/bigrss.png b/src/lib/data/icons/other/bigrss.png similarity index 100% rename from src/data/icons/other/bigrss.png rename to src/lib/data/icons/other/bigrss.png diff --git a/src/data/icons/other/bigstar.png b/src/lib/data/icons/other/bigstar.png similarity index 100% rename from src/data/icons/other/bigstar.png rename to src/lib/data/icons/other/bigstar.png diff --git a/src/data/icons/other/feed.png b/src/lib/data/icons/other/feed.png similarity index 100% rename from src/data/icons/other/feed.png rename to src/lib/data/icons/other/feed.png diff --git a/src/data/icons/other/keys.png b/src/lib/data/icons/other/keys.png similarity index 100% rename from src/data/icons/other/keys.png rename to src/lib/data/icons/other/keys.png diff --git a/src/data/icons/other/list-add.png b/src/lib/data/icons/other/list-add.png similarity index 100% rename from src/data/icons/other/list-add.png rename to src/lib/data/icons/other/list-add.png diff --git a/src/data/icons/other/progress.gif b/src/lib/data/icons/other/progress.gif similarity index 100% rename from src/data/icons/other/progress.gif rename to src/lib/data/icons/other/progress.gif diff --git a/src/data/icons/other/semi-transparent.png b/src/lib/data/icons/other/semi-transparent.png similarity index 100% rename from src/data/icons/other/semi-transparent.png rename to src/lib/data/icons/other/semi-transparent.png diff --git a/src/data/icons/other/unsortedbookmarks.png b/src/lib/data/icons/other/unsortedbookmarks.png similarity index 100% rename from src/data/icons/other/unsortedbookmarks.png rename to src/lib/data/icons/other/unsortedbookmarks.png diff --git a/src/data/icons/preferences/application-x-theme.png b/src/lib/data/icons/preferences/application-x-theme.png similarity index 100% rename from src/data/icons/preferences/application-x-theme.png rename to src/lib/data/icons/preferences/application-x-theme.png diff --git a/src/data/icons/preferences/applications-fonts.png b/src/lib/data/icons/preferences/applications-fonts.png similarity index 100% rename from src/data/icons/preferences/applications-fonts.png rename to src/lib/data/icons/preferences/applications-fonts.png diff --git a/src/data/icons/preferences/applications-graphics.png b/src/lib/data/icons/preferences/applications-graphics.png similarity index 100% rename from src/data/icons/preferences/applications-graphics.png rename to src/lib/data/icons/preferences/applications-graphics.png diff --git a/src/data/icons/preferences/applications-internet.png b/src/lib/data/icons/preferences/applications-internet.png similarity index 100% rename from src/data/icons/preferences/applications-internet.png rename to src/lib/data/icons/preferences/applications-internet.png diff --git a/src/data/icons/preferences/applications-system.png b/src/lib/data/icons/preferences/applications-system.png similarity index 100% rename from src/data/icons/preferences/applications-system.png rename to src/lib/data/icons/preferences/applications-system.png diff --git a/src/data/icons/preferences/applications-webbrowsers.png b/src/lib/data/icons/preferences/applications-webbrowsers.png similarity index 100% rename from src/data/icons/preferences/applications-webbrowsers.png rename to src/lib/data/icons/preferences/applications-webbrowsers.png diff --git a/src/data/icons/preferences/contact-new.png b/src/lib/data/icons/preferences/contact-new.png similarity index 100% rename from src/data/icons/preferences/contact-new.png rename to src/lib/data/icons/preferences/contact-new.png diff --git a/src/data/icons/preferences/dialog-password.png b/src/lib/data/icons/preferences/dialog-password.png similarity index 100% rename from src/data/icons/preferences/dialog-password.png rename to src/lib/data/icons/preferences/dialog-password.png diff --git a/src/data/icons/preferences/dialog-question.png b/src/lib/data/icons/preferences/dialog-question.png similarity index 100% rename from src/data/icons/preferences/dialog-question.png rename to src/lib/data/icons/preferences/dialog-question.png diff --git a/src/data/icons/preferences/document-properties.png b/src/lib/data/icons/preferences/document-properties.png similarity index 100% rename from src/data/icons/preferences/document-properties.png rename to src/lib/data/icons/preferences/document-properties.png diff --git a/src/data/icons/preferences/extension.png b/src/lib/data/icons/preferences/extension.png similarity index 100% rename from src/data/icons/preferences/extension.png rename to src/lib/data/icons/preferences/extension.png diff --git a/src/data/icons/preferences/mail-inbox.png b/src/lib/data/icons/preferences/mail-inbox.png similarity index 100% rename from src/data/icons/preferences/mail-inbox.png rename to src/lib/data/icons/preferences/mail-inbox.png diff --git a/src/data/icons/preferences/preferences-desktop.png b/src/lib/data/icons/preferences/preferences-desktop.png similarity index 100% rename from src/data/icons/preferences/preferences-desktop.png rename to src/lib/data/icons/preferences/preferences-desktop.png diff --git a/src/data/icons/preferences/preferences-system-firewall.png b/src/lib/data/icons/preferences/preferences-system-firewall.png similarity index 100% rename from src/data/icons/preferences/preferences-system-firewall.png rename to src/lib/data/icons/preferences/preferences-system-firewall.png diff --git a/src/data/icons/preferences/style-default.png b/src/lib/data/icons/preferences/style-default.png similarity index 100% rename from src/data/icons/preferences/style-default.png rename to src/lib/data/icons/preferences/style-default.png diff --git a/src/data/icons/qupzilla.png b/src/lib/data/icons/qupzilla.png similarity index 100% rename from src/data/icons/qupzilla.png rename to src/lib/data/icons/qupzilla.png diff --git a/src/data/icons/qupzillaupdate.png b/src/lib/data/icons/qupzillaupdate.png similarity index 100% rename from src/data/icons/qupzillaupdate.png rename to src/lib/data/icons/qupzillaupdate.png diff --git a/src/data/icons/transp.png b/src/lib/data/icons/transp.png similarity index 100% rename from src/data/icons/transp.png rename to src/lib/data/icons/transp.png diff --git a/src/data/qupzilla.png b/src/lib/data/qupzilla.png similarity index 100% rename from src/data/qupzilla.png rename to src/lib/data/qupzilla.png diff --git a/src/desktopnotifications/desktopnotification.cpp b/src/lib/desktopnotifications/desktopnotification.cpp similarity index 100% rename from src/desktopnotifications/desktopnotification.cpp rename to src/lib/desktopnotifications/desktopnotification.cpp diff --git a/src/desktopnotifications/desktopnotification.h b/src/lib/desktopnotifications/desktopnotification.h similarity index 100% rename from src/desktopnotifications/desktopnotification.h rename to src/lib/desktopnotifications/desktopnotification.h diff --git a/src/desktopnotifications/desktopnotification.ui b/src/lib/desktopnotifications/desktopnotification.ui similarity index 100% rename from src/desktopnotifications/desktopnotification.ui rename to src/lib/desktopnotifications/desktopnotification.ui diff --git a/src/desktopnotifications/desktopnotificationsfactory.cpp b/src/lib/desktopnotifications/desktopnotificationsfactory.cpp similarity index 100% rename from src/desktopnotifications/desktopnotificationsfactory.cpp rename to src/lib/desktopnotifications/desktopnotificationsfactory.cpp diff --git a/src/desktopnotifications/desktopnotificationsfactory.h b/src/lib/desktopnotifications/desktopnotificationsfactory.h similarity index 100% rename from src/desktopnotifications/desktopnotificationsfactory.h rename to src/lib/desktopnotifications/desktopnotificationsfactory.h diff --git a/src/downloads/downloadfilehelper.cpp b/src/lib/downloads/downloadfilehelper.cpp similarity index 100% rename from src/downloads/downloadfilehelper.cpp rename to src/lib/downloads/downloadfilehelper.cpp diff --git a/src/downloads/downloadfilehelper.h b/src/lib/downloads/downloadfilehelper.h similarity index 100% rename from src/downloads/downloadfilehelper.h rename to src/lib/downloads/downloadfilehelper.h diff --git a/src/downloads/downloaditem.cpp b/src/lib/downloads/downloaditem.cpp similarity index 100% rename from src/downloads/downloaditem.cpp rename to src/lib/downloads/downloaditem.cpp diff --git a/src/downloads/downloaditem.h b/src/lib/downloads/downloaditem.h similarity index 100% rename from src/downloads/downloaditem.h rename to src/lib/downloads/downloaditem.h diff --git a/src/downloads/downloaditem.ui b/src/lib/downloads/downloaditem.ui similarity index 100% rename from src/downloads/downloaditem.ui rename to src/lib/downloads/downloaditem.ui diff --git a/src/downloads/downloadmanager.cpp b/src/lib/downloads/downloadmanager.cpp similarity index 100% rename from src/downloads/downloadmanager.cpp rename to src/lib/downloads/downloadmanager.cpp diff --git a/src/downloads/downloadmanager.h b/src/lib/downloads/downloadmanager.h similarity index 100% rename from src/downloads/downloadmanager.h rename to src/lib/downloads/downloadmanager.h diff --git a/src/downloads/downloadmanager.ui b/src/lib/downloads/downloadmanager.ui similarity index 100% rename from src/downloads/downloadmanager.ui rename to src/lib/downloads/downloadmanager.ui diff --git a/src/downloads/downloadoptionsdialog.cpp b/src/lib/downloads/downloadoptionsdialog.cpp similarity index 100% rename from src/downloads/downloadoptionsdialog.cpp rename to src/lib/downloads/downloadoptionsdialog.cpp diff --git a/src/downloads/downloadoptionsdialog.h b/src/lib/downloads/downloadoptionsdialog.h similarity index 100% rename from src/downloads/downloadoptionsdialog.h rename to src/lib/downloads/downloadoptionsdialog.h diff --git a/src/downloads/downloadoptionsdialog.ui b/src/lib/downloads/downloadoptionsdialog.ui similarity index 100% rename from src/downloads/downloadoptionsdialog.ui rename to src/lib/downloads/downloadoptionsdialog.ui diff --git a/src/history/historymanager.cpp b/src/lib/history/historymanager.cpp similarity index 100% rename from src/history/historymanager.cpp rename to src/lib/history/historymanager.cpp diff --git a/src/history/historymanager.h b/src/lib/history/historymanager.h similarity index 100% rename from src/history/historymanager.h rename to src/lib/history/historymanager.h diff --git a/src/history/historymanager.ui b/src/lib/history/historymanager.ui similarity index 100% rename from src/history/historymanager.ui rename to src/lib/history/historymanager.ui diff --git a/src/history/historymodel.cpp b/src/lib/history/historymodel.cpp similarity index 100% rename from src/history/historymodel.cpp rename to src/lib/history/historymodel.cpp diff --git a/src/history/historymodel.h b/src/lib/history/historymodel.h similarity index 100% rename from src/history/historymodel.h rename to src/lib/history/historymodel.h diff --git a/src/history/webhistoryinterface.cpp b/src/lib/history/webhistoryinterface.cpp similarity index 100% rename from src/history/webhistoryinterface.cpp rename to src/lib/history/webhistoryinterface.cpp diff --git a/src/history/webhistoryinterface.h b/src/lib/history/webhistoryinterface.h similarity index 100% rename from src/history/webhistoryinterface.h rename to src/lib/history/webhistoryinterface.h diff --git a/src/src.pri b/src/lib/lib.pro similarity index 91% rename from src/src.pri rename to src/lib/lib.pro index 9ecb8e2e4..58fda38d6 100644 --- a/src/src.pri +++ b/src/lib/lib.pro @@ -1,29 +1,36 @@ -DEPENDPATH = $$PWD -INCLUDEPATH += $$PWD/3rdparty\ - $$PWD/app\ - $$PWD/autofill\ - $$PWD/bookmarks\ - $$PWD/cookies\ - $$PWD/downloads\ - $$PWD/history\ - $$PWD/navigation\ - $$PWD/network\ - $$PWD/other\ - $$PWD/preferences\ - $$PWD/rss\ - $$PWD/tools\ - $$PWD/utils\ - $$PWD/webview\ - $$PWD/plugins\ - $$PWD/sidebar\ - $$PWD/data\ - $$PWD/adblock\ - $$PWD/desktopnotifications\ - $$PWD/opensearch\ - $$PWD/bookmarksimport\ - $$PWD/popupwindow\ +QT += core gui webkit sql network script +unix:QT += dbus +TARGET = qupzilla +TEMPLATE = lib -SOURCES += main.cpp\ +include(3rdparty/qtsingleapplication.pri) +include(../defines.pri) + +INCLUDEPATH += 3rdparty\ + app\ + autofill\ + bookmarks\ + cookies\ + downloads\ + history\ + navigation\ + network\ + other\ + preferences\ + rss\ + tools\ + utils\ + webview\ + plugins\ + sidebar\ + data\ + adblock\ + desktopnotifications\ + opensearch\ + bookmarksimport\ + popupwindow\ + +SOURCES += \ 3rdparty/qtwin.cpp \ 3rdparty/lineedit.cpp \ app/qupzilla.cpp \ @@ -332,10 +339,12 @@ RESOURCES += \ data/html.qrc \ data/data.qrc -OTHER_FILES += \ - appicon.rc \ - appicon_os2.rc \ - Info.plist +!mac:unix { + target.path = $$library_folder -os2:RC_FILE = appicon_os2.rc -win32:RC_FILE = appicon.rc + INSTALLS += target +} + +message(========== Building libqupzilla ==========) +message( Using following defines:) +message($$DEFINES) diff --git a/src/navigation/downicon.cpp b/src/lib/navigation/downicon.cpp similarity index 100% rename from src/navigation/downicon.cpp rename to src/lib/navigation/downicon.cpp diff --git a/src/navigation/downicon.h b/src/lib/navigation/downicon.h similarity index 100% rename from src/navigation/downicon.h rename to src/lib/navigation/downicon.h diff --git a/src/navigation/goicon.cpp b/src/lib/navigation/goicon.cpp similarity index 100% rename from src/navigation/goicon.cpp rename to src/lib/navigation/goicon.cpp diff --git a/src/navigation/goicon.h b/src/lib/navigation/goicon.h similarity index 100% rename from src/navigation/goicon.h rename to src/lib/navigation/goicon.h diff --git a/src/navigation/locationbar.cpp b/src/lib/navigation/locationbar.cpp similarity index 100% rename from src/navigation/locationbar.cpp rename to src/lib/navigation/locationbar.cpp diff --git a/src/navigation/locationbar.h b/src/lib/navigation/locationbar.h similarity index 100% rename from src/navigation/locationbar.h rename to src/lib/navigation/locationbar.h diff --git a/src/navigation/locationbarsettings.cpp b/src/lib/navigation/locationbarsettings.cpp similarity index 100% rename from src/navigation/locationbarsettings.cpp rename to src/lib/navigation/locationbarsettings.cpp diff --git a/src/navigation/locationbarsettings.h b/src/lib/navigation/locationbarsettings.h similarity index 100% rename from src/navigation/locationbarsettings.h rename to src/lib/navigation/locationbarsettings.h diff --git a/src/navigation/locationcompleter.cpp b/src/lib/navigation/locationcompleter.cpp similarity index 100% rename from src/navigation/locationcompleter.cpp rename to src/lib/navigation/locationcompleter.cpp diff --git a/src/navigation/locationcompleter.h b/src/lib/navigation/locationcompleter.h similarity index 100% rename from src/navigation/locationcompleter.h rename to src/lib/navigation/locationcompleter.h diff --git a/src/navigation/locationpopup.cpp b/src/lib/navigation/locationpopup.cpp similarity index 100% rename from src/navigation/locationpopup.cpp rename to src/lib/navigation/locationpopup.cpp diff --git a/src/navigation/locationpopup.h b/src/lib/navigation/locationpopup.h similarity index 100% rename from src/navigation/locationpopup.h rename to src/lib/navigation/locationpopup.h diff --git a/src/navigation/navigationbar.cpp b/src/lib/navigation/navigationbar.cpp similarity index 100% rename from src/navigation/navigationbar.cpp rename to src/lib/navigation/navigationbar.cpp diff --git a/src/navigation/navigationbar.h b/src/lib/navigation/navigationbar.h similarity index 100% rename from src/navigation/navigationbar.h rename to src/lib/navigation/navigationbar.h diff --git a/src/navigation/reloadstopbutton.cpp b/src/lib/navigation/reloadstopbutton.cpp similarity index 100% rename from src/navigation/reloadstopbutton.cpp rename to src/lib/navigation/reloadstopbutton.cpp diff --git a/src/navigation/reloadstopbutton.h b/src/lib/navigation/reloadstopbutton.h similarity index 100% rename from src/navigation/reloadstopbutton.h rename to src/lib/navigation/reloadstopbutton.h diff --git a/src/navigation/siteicon.cpp b/src/lib/navigation/siteicon.cpp similarity index 100% rename from src/navigation/siteicon.cpp rename to src/lib/navigation/siteicon.cpp diff --git a/src/navigation/siteicon.h b/src/lib/navigation/siteicon.h similarity index 100% rename from src/navigation/siteicon.h rename to src/lib/navigation/siteicon.h diff --git a/src/navigation/websearchbar.cpp b/src/lib/navigation/websearchbar.cpp similarity index 99% rename from src/navigation/websearchbar.cpp rename to src/lib/navigation/websearchbar.cpp index d49df6530..850088c67 100644 --- a/src/navigation/websearchbar.cpp +++ b/src/lib/navigation/websearchbar.cpp @@ -45,7 +45,6 @@ WebSearchBar::WebSearchBar(QupZilla* mainClass, QWidget* parent) addWidget(m_buttonSearch, LineEdit::RightSide); - connect(this, SIGNAL(returnPressed()), this, SLOT(search())); connect(m_buttonSearch, SIGNAL(clicked(QPoint)), this, SLOT(search())); connect(m_buttonSearch, SIGNAL(middleClicked(QPoint)), this, SLOT(searchInNewTab())); connect(m_boxSearchType, SIGNAL(activeItemChanged(ButtonWithMenu::Item)), this, SLOT(searchChanged(ButtonWithMenu::Item))); diff --git a/src/navigation/websearchbar.h b/src/lib/navigation/websearchbar.h similarity index 100% rename from src/navigation/websearchbar.h rename to src/lib/navigation/websearchbar.h diff --git a/src/network/cabundleupdater.cpp b/src/lib/network/cabundleupdater.cpp similarity index 100% rename from src/network/cabundleupdater.cpp rename to src/lib/network/cabundleupdater.cpp diff --git a/src/network/cabundleupdater.h b/src/lib/network/cabundleupdater.h similarity index 100% rename from src/network/cabundleupdater.h rename to src/lib/network/cabundleupdater.h diff --git a/src/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp similarity index 100% rename from src/network/networkmanager.cpp rename to src/lib/network/networkmanager.cpp diff --git a/src/network/networkmanager.h b/src/lib/network/networkmanager.h similarity index 100% rename from src/network/networkmanager.h rename to src/lib/network/networkmanager.h diff --git a/src/network/networkmanagerproxy.cpp b/src/lib/network/networkmanagerproxy.cpp similarity index 100% rename from src/network/networkmanagerproxy.cpp rename to src/lib/network/networkmanagerproxy.cpp diff --git a/src/network/networkmanagerproxy.h b/src/lib/network/networkmanagerproxy.h similarity index 100% rename from src/network/networkmanagerproxy.h rename to src/lib/network/networkmanagerproxy.h diff --git a/src/network/networkproxyfactory.cpp b/src/lib/network/networkproxyfactory.cpp similarity index 100% rename from src/network/networkproxyfactory.cpp rename to src/lib/network/networkproxyfactory.cpp diff --git a/src/network/networkproxyfactory.h b/src/lib/network/networkproxyfactory.h similarity index 100% rename from src/network/networkproxyfactory.h rename to src/lib/network/networkproxyfactory.h diff --git a/src/network/qupzillaschemehandler.cpp b/src/lib/network/qupzillaschemehandler.cpp similarity index 100% rename from src/network/qupzillaschemehandler.cpp rename to src/lib/network/qupzillaschemehandler.cpp diff --git a/src/network/qupzillaschemehandler.h b/src/lib/network/qupzillaschemehandler.h similarity index 100% rename from src/network/qupzillaschemehandler.h rename to src/lib/network/qupzillaschemehandler.h diff --git a/src/opensearch/editsearchengine.cpp b/src/lib/opensearch/editsearchengine.cpp similarity index 100% rename from src/opensearch/editsearchengine.cpp rename to src/lib/opensearch/editsearchengine.cpp diff --git a/src/opensearch/editsearchengine.h b/src/lib/opensearch/editsearchengine.h similarity index 100% rename from src/opensearch/editsearchengine.h rename to src/lib/opensearch/editsearchengine.h diff --git a/src/opensearch/editsearchengine.ui b/src/lib/opensearch/editsearchengine.ui similarity index 100% rename from src/opensearch/editsearchengine.ui rename to src/lib/opensearch/editsearchengine.ui diff --git a/src/opensearch/opensearchengine.cpp b/src/lib/opensearch/opensearchengine.cpp similarity index 100% rename from src/opensearch/opensearchengine.cpp rename to src/lib/opensearch/opensearchengine.cpp diff --git a/src/opensearch/opensearchengine.h b/src/lib/opensearch/opensearchengine.h similarity index 100% rename from src/opensearch/opensearchengine.h rename to src/lib/opensearch/opensearchengine.h diff --git a/src/opensearch/opensearchenginedelegate.cpp b/src/lib/opensearch/opensearchenginedelegate.cpp similarity index 100% rename from src/opensearch/opensearchenginedelegate.cpp rename to src/lib/opensearch/opensearchenginedelegate.cpp diff --git a/src/opensearch/opensearchenginedelegate.h b/src/lib/opensearch/opensearchenginedelegate.h similarity index 100% rename from src/opensearch/opensearchenginedelegate.h rename to src/lib/opensearch/opensearchenginedelegate.h diff --git a/src/opensearch/opensearchreader.cpp b/src/lib/opensearch/opensearchreader.cpp similarity index 100% rename from src/opensearch/opensearchreader.cpp rename to src/lib/opensearch/opensearchreader.cpp diff --git a/src/opensearch/opensearchreader.h b/src/lib/opensearch/opensearchreader.h similarity index 100% rename from src/opensearch/opensearchreader.h rename to src/lib/opensearch/opensearchreader.h diff --git a/src/opensearch/searchenginesdialog.cpp b/src/lib/opensearch/searchenginesdialog.cpp similarity index 100% rename from src/opensearch/searchenginesdialog.cpp rename to src/lib/opensearch/searchenginesdialog.cpp diff --git a/src/opensearch/searchenginesdialog.h b/src/lib/opensearch/searchenginesdialog.h similarity index 100% rename from src/opensearch/searchenginesdialog.h rename to src/lib/opensearch/searchenginesdialog.h diff --git a/src/opensearch/searchenginesdialog.ui b/src/lib/opensearch/searchenginesdialog.ui similarity index 100% rename from src/opensearch/searchenginesdialog.ui rename to src/lib/opensearch/searchenginesdialog.ui diff --git a/src/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp similarity index 100% rename from src/opensearch/searchenginesmanager.cpp rename to src/lib/opensearch/searchenginesmanager.cpp diff --git a/src/opensearch/searchenginesmanager.h b/src/lib/opensearch/searchenginesmanager.h similarity index 100% rename from src/opensearch/searchenginesmanager.h rename to src/lib/opensearch/searchenginesmanager.h diff --git a/src/other/aboutdialog.cpp b/src/lib/other/aboutdialog.cpp similarity index 100% rename from src/other/aboutdialog.cpp rename to src/lib/other/aboutdialog.cpp diff --git a/src/other/aboutdialog.h b/src/lib/other/aboutdialog.h similarity index 100% rename from src/other/aboutdialog.h rename to src/lib/other/aboutdialog.h diff --git a/src/other/aboutdialog.ui b/src/lib/other/aboutdialog.ui similarity index 100% rename from src/other/aboutdialog.ui rename to src/lib/other/aboutdialog.ui diff --git a/src/other/browsinglibrary.cpp b/src/lib/other/browsinglibrary.cpp similarity index 100% rename from src/other/browsinglibrary.cpp rename to src/lib/other/browsinglibrary.cpp diff --git a/src/other/browsinglibrary.h b/src/lib/other/browsinglibrary.h similarity index 100% rename from src/other/browsinglibrary.h rename to src/lib/other/browsinglibrary.h diff --git a/src/other/browsinglibrary.ui b/src/lib/other/browsinglibrary.ui similarity index 100% rename from src/other/browsinglibrary.ui rename to src/lib/other/browsinglibrary.ui diff --git a/src/other/clearprivatedata.cpp b/src/lib/other/clearprivatedata.cpp similarity index 100% rename from src/other/clearprivatedata.cpp rename to src/lib/other/clearprivatedata.cpp diff --git a/src/other/clearprivatedata.h b/src/lib/other/clearprivatedata.h similarity index 100% rename from src/other/clearprivatedata.h rename to src/lib/other/clearprivatedata.h diff --git a/src/other/clearprivatedata.ui b/src/lib/other/clearprivatedata.ui similarity index 100% rename from src/other/clearprivatedata.ui rename to src/lib/other/clearprivatedata.ui diff --git a/src/other/closedialog.ui b/src/lib/other/closedialog.ui similarity index 100% rename from src/other/closedialog.ui rename to src/lib/other/closedialog.ui diff --git a/src/other/databasewriter.cpp b/src/lib/other/databasewriter.cpp similarity index 100% rename from src/other/databasewriter.cpp rename to src/lib/other/databasewriter.cpp diff --git a/src/other/databasewriter.h b/src/lib/other/databasewriter.h similarity index 100% rename from src/other/databasewriter.h rename to src/lib/other/databasewriter.h diff --git a/src/other/pagescreen.cpp b/src/lib/other/pagescreen.cpp similarity index 100% rename from src/other/pagescreen.cpp rename to src/lib/other/pagescreen.cpp diff --git a/src/other/pagescreen.h b/src/lib/other/pagescreen.h similarity index 100% rename from src/other/pagescreen.h rename to src/lib/other/pagescreen.h diff --git a/src/other/pagescreen.ui b/src/lib/other/pagescreen.ui similarity index 100% rename from src/other/pagescreen.ui rename to src/lib/other/pagescreen.ui diff --git a/src/other/sourceviewer.cpp b/src/lib/other/sourceviewer.cpp similarity index 100% rename from src/other/sourceviewer.cpp rename to src/lib/other/sourceviewer.cpp diff --git a/src/other/sourceviewer.h b/src/lib/other/sourceviewer.h similarity index 100% rename from src/other/sourceviewer.h rename to src/lib/other/sourceviewer.h diff --git a/src/other/sourceviewersearch.cpp b/src/lib/other/sourceviewersearch.cpp similarity index 100% rename from src/other/sourceviewersearch.cpp rename to src/lib/other/sourceviewersearch.cpp diff --git a/src/other/sourceviewersearch.h b/src/lib/other/sourceviewersearch.h similarity index 100% rename from src/other/sourceviewersearch.h rename to src/lib/other/sourceviewersearch.h diff --git a/src/other/sourceviewersearch.ui b/src/lib/other/sourceviewersearch.ui similarity index 100% rename from src/other/sourceviewersearch.ui rename to src/lib/other/sourceviewersearch.ui diff --git a/src/other/statusbarmessage.cpp b/src/lib/other/statusbarmessage.cpp similarity index 100% rename from src/other/statusbarmessage.cpp rename to src/lib/other/statusbarmessage.cpp diff --git a/src/other/statusbarmessage.h b/src/lib/other/statusbarmessage.h similarity index 100% rename from src/other/statusbarmessage.h rename to src/lib/other/statusbarmessage.h diff --git a/src/other/updater.cpp b/src/lib/other/updater.cpp similarity index 100% rename from src/other/updater.cpp rename to src/lib/other/updater.cpp diff --git a/src/other/updater.h b/src/lib/other/updater.h similarity index 100% rename from src/other/updater.h rename to src/lib/other/updater.h diff --git a/src/plugins/clicktoflash.cpp b/src/lib/plugins/clicktoflash.cpp similarity index 100% rename from src/plugins/clicktoflash.cpp rename to src/lib/plugins/clicktoflash.cpp diff --git a/src/plugins/clicktoflash.h b/src/lib/plugins/clicktoflash.h similarity index 100% rename from src/plugins/clicktoflash.h rename to src/lib/plugins/clicktoflash.h diff --git a/src/plugins/plugininterface.h b/src/lib/plugins/plugininterface.h similarity index 100% rename from src/plugins/plugininterface.h rename to src/lib/plugins/plugininterface.h diff --git a/src/plugins/pluginproxy.cpp b/src/lib/plugins/pluginproxy.cpp similarity index 100% rename from src/plugins/pluginproxy.cpp rename to src/lib/plugins/pluginproxy.cpp diff --git a/src/plugins/pluginproxy.h b/src/lib/plugins/pluginproxy.h similarity index 100% rename from src/plugins/pluginproxy.h rename to src/lib/plugins/pluginproxy.h diff --git a/src/plugins/plugins.cpp b/src/lib/plugins/plugins.cpp similarity index 100% rename from src/plugins/plugins.cpp rename to src/lib/plugins/plugins.cpp diff --git a/src/plugins/plugins.h b/src/lib/plugins/plugins.h similarity index 100% rename from src/plugins/plugins.h rename to src/lib/plugins/plugins.h diff --git a/src/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp similarity index 100% rename from src/plugins/speeddial.cpp rename to src/lib/plugins/speeddial.cpp diff --git a/src/plugins/speeddial.h b/src/lib/plugins/speeddial.h similarity index 100% rename from src/plugins/speeddial.h rename to src/lib/plugins/speeddial.h diff --git a/src/plugins/webpluginfactory.cpp b/src/lib/plugins/webpluginfactory.cpp similarity index 100% rename from src/plugins/webpluginfactory.cpp rename to src/lib/plugins/webpluginfactory.cpp diff --git a/src/plugins/webpluginfactory.h b/src/lib/plugins/webpluginfactory.h similarity index 100% rename from src/plugins/webpluginfactory.h rename to src/lib/plugins/webpluginfactory.h diff --git a/src/popupwindow/popuplocationbar.cpp b/src/lib/popupwindow/popuplocationbar.cpp similarity index 100% rename from src/popupwindow/popuplocationbar.cpp rename to src/lib/popupwindow/popuplocationbar.cpp diff --git a/src/popupwindow/popuplocationbar.h b/src/lib/popupwindow/popuplocationbar.h similarity index 100% rename from src/popupwindow/popuplocationbar.h rename to src/lib/popupwindow/popuplocationbar.h diff --git a/src/popupwindow/popupwebpage.cpp b/src/lib/popupwindow/popupwebpage.cpp similarity index 100% rename from src/popupwindow/popupwebpage.cpp rename to src/lib/popupwindow/popupwebpage.cpp diff --git a/src/popupwindow/popupwebpage.h b/src/lib/popupwindow/popupwebpage.h similarity index 100% rename from src/popupwindow/popupwebpage.h rename to src/lib/popupwindow/popupwebpage.h diff --git a/src/popupwindow/popupwindow.cpp b/src/lib/popupwindow/popupwindow.cpp similarity index 100% rename from src/popupwindow/popupwindow.cpp rename to src/lib/popupwindow/popupwindow.cpp diff --git a/src/popupwindow/popupwindow.h b/src/lib/popupwindow/popupwindow.h similarity index 100% rename from src/popupwindow/popupwindow.h rename to src/lib/popupwindow/popupwindow.h diff --git a/src/preferences/acceptlanguage.cpp b/src/lib/preferences/acceptlanguage.cpp similarity index 100% rename from src/preferences/acceptlanguage.cpp rename to src/lib/preferences/acceptlanguage.cpp diff --git a/src/preferences/acceptlanguage.h b/src/lib/preferences/acceptlanguage.h similarity index 100% rename from src/preferences/acceptlanguage.h rename to src/lib/preferences/acceptlanguage.h diff --git a/src/preferences/acceptlanguage.ui b/src/lib/preferences/acceptlanguage.ui similarity index 100% rename from src/preferences/acceptlanguage.ui rename to src/lib/preferences/acceptlanguage.ui diff --git a/src/preferences/addacceptlanguage.ui b/src/lib/preferences/addacceptlanguage.ui similarity index 100% rename from src/preferences/addacceptlanguage.ui rename to src/lib/preferences/addacceptlanguage.ui diff --git a/src/preferences/autofillmanager.cpp b/src/lib/preferences/autofillmanager.cpp similarity index 100% rename from src/preferences/autofillmanager.cpp rename to src/lib/preferences/autofillmanager.cpp diff --git a/src/preferences/autofillmanager.h b/src/lib/preferences/autofillmanager.h similarity index 100% rename from src/preferences/autofillmanager.h rename to src/lib/preferences/autofillmanager.h diff --git a/src/preferences/autofillmanager.ui b/src/lib/preferences/autofillmanager.ui similarity index 100% rename from src/preferences/autofillmanager.ui rename to src/lib/preferences/autofillmanager.ui diff --git a/src/preferences/pluginslist.cpp b/src/lib/preferences/pluginslist.cpp similarity index 100% rename from src/preferences/pluginslist.cpp rename to src/lib/preferences/pluginslist.cpp diff --git a/src/preferences/pluginslist.h b/src/lib/preferences/pluginslist.h similarity index 100% rename from src/preferences/pluginslist.h rename to src/lib/preferences/pluginslist.h diff --git a/src/preferences/pluginslist.ui b/src/lib/preferences/pluginslist.ui similarity index 100% rename from src/preferences/pluginslist.ui rename to src/lib/preferences/pluginslist.ui diff --git a/src/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp similarity index 100% rename from src/preferences/preferences.cpp rename to src/lib/preferences/preferences.cpp diff --git a/src/preferences/preferences.h b/src/lib/preferences/preferences.h similarity index 100% rename from src/preferences/preferences.h rename to src/lib/preferences/preferences.h diff --git a/src/preferences/preferences.ui b/src/lib/preferences/preferences.ui similarity index 100% rename from src/preferences/preferences.ui rename to src/lib/preferences/preferences.ui diff --git a/src/preferences/sslmanager.cpp b/src/lib/preferences/sslmanager.cpp similarity index 100% rename from src/preferences/sslmanager.cpp rename to src/lib/preferences/sslmanager.cpp diff --git a/src/preferences/sslmanager.h b/src/lib/preferences/sslmanager.h similarity index 100% rename from src/preferences/sslmanager.h rename to src/lib/preferences/sslmanager.h diff --git a/src/preferences/sslmanager.ui b/src/lib/preferences/sslmanager.ui similarity index 100% rename from src/preferences/sslmanager.ui rename to src/lib/preferences/sslmanager.ui diff --git a/src/preferences/thememanager.cpp b/src/lib/preferences/thememanager.cpp similarity index 100% rename from src/preferences/thememanager.cpp rename to src/lib/preferences/thememanager.cpp diff --git a/src/preferences/thememanager.h b/src/lib/preferences/thememanager.h similarity index 100% rename from src/preferences/thememanager.h rename to src/lib/preferences/thememanager.h diff --git a/src/preferences/thememanager.ui b/src/lib/preferences/thememanager.ui similarity index 100% rename from src/preferences/thememanager.ui rename to src/lib/preferences/thememanager.ui diff --git a/src/rss/rssicon.cpp b/src/lib/rss/rssicon.cpp similarity index 100% rename from src/rss/rssicon.cpp rename to src/lib/rss/rssicon.cpp diff --git a/src/rss/rssicon.h b/src/lib/rss/rssicon.h similarity index 100% rename from src/rss/rssicon.h rename to src/lib/rss/rssicon.h diff --git a/src/rss/rssmanager.cpp b/src/lib/rss/rssmanager.cpp similarity index 100% rename from src/rss/rssmanager.cpp rename to src/lib/rss/rssmanager.cpp diff --git a/src/rss/rssmanager.h b/src/lib/rss/rssmanager.h similarity index 100% rename from src/rss/rssmanager.h rename to src/lib/rss/rssmanager.h diff --git a/src/rss/rssmanager.ui b/src/lib/rss/rssmanager.ui similarity index 100% rename from src/rss/rssmanager.ui rename to src/lib/rss/rssmanager.ui diff --git a/src/rss/rssnotification.cpp b/src/lib/rss/rssnotification.cpp similarity index 100% rename from src/rss/rssnotification.cpp rename to src/lib/rss/rssnotification.cpp diff --git a/src/rss/rssnotification.h b/src/lib/rss/rssnotification.h similarity index 100% rename from src/rss/rssnotification.h rename to src/lib/rss/rssnotification.h diff --git a/src/rss/rssnotification.ui b/src/lib/rss/rssnotification.ui similarity index 100% rename from src/rss/rssnotification.ui rename to src/lib/rss/rssnotification.ui diff --git a/src/rss/rsswidget.cpp b/src/lib/rss/rsswidget.cpp similarity index 100% rename from src/rss/rsswidget.cpp rename to src/lib/rss/rsswidget.cpp diff --git a/src/rss/rsswidget.h b/src/lib/rss/rsswidget.h similarity index 100% rename from src/rss/rsswidget.h rename to src/lib/rss/rsswidget.h diff --git a/src/rss/rsswidget.ui b/src/lib/rss/rsswidget.ui similarity index 100% rename from src/rss/rsswidget.ui rename to src/lib/rss/rsswidget.ui diff --git a/src/sidebar/bookmarkssidebar.cpp b/src/lib/sidebar/bookmarkssidebar.cpp similarity index 100% rename from src/sidebar/bookmarkssidebar.cpp rename to src/lib/sidebar/bookmarkssidebar.cpp diff --git a/src/sidebar/bookmarkssidebar.h b/src/lib/sidebar/bookmarkssidebar.h similarity index 100% rename from src/sidebar/bookmarkssidebar.h rename to src/lib/sidebar/bookmarkssidebar.h diff --git a/src/sidebar/bookmarkssidebar.ui b/src/lib/sidebar/bookmarkssidebar.ui similarity index 100% rename from src/sidebar/bookmarkssidebar.ui rename to src/lib/sidebar/bookmarkssidebar.ui diff --git a/src/sidebar/historysidebar.cpp b/src/lib/sidebar/historysidebar.cpp similarity index 100% rename from src/sidebar/historysidebar.cpp rename to src/lib/sidebar/historysidebar.cpp diff --git a/src/sidebar/historysidebar.h b/src/lib/sidebar/historysidebar.h similarity index 100% rename from src/sidebar/historysidebar.h rename to src/lib/sidebar/historysidebar.h diff --git a/src/sidebar/historysidebar.ui b/src/lib/sidebar/historysidebar.ui similarity index 100% rename from src/sidebar/historysidebar.ui rename to src/lib/sidebar/historysidebar.ui diff --git a/src/sidebar/sidebar.cpp b/src/lib/sidebar/sidebar.cpp similarity index 100% rename from src/sidebar/sidebar.cpp rename to src/lib/sidebar/sidebar.cpp diff --git a/src/sidebar/sidebar.h b/src/lib/sidebar/sidebar.h similarity index 100% rename from src/sidebar/sidebar.h rename to src/lib/sidebar/sidebar.h diff --git a/src/tools/animatedwidget.cpp b/src/lib/tools/animatedwidget.cpp similarity index 100% rename from src/tools/animatedwidget.cpp rename to src/lib/tools/animatedwidget.cpp diff --git a/src/tools/animatedwidget.h b/src/lib/tools/animatedwidget.h similarity index 100% rename from src/tools/animatedwidget.h rename to src/lib/tools/animatedwidget.h diff --git a/src/tools/buttonbox.cpp b/src/lib/tools/buttonbox.cpp similarity index 100% rename from src/tools/buttonbox.cpp rename to src/lib/tools/buttonbox.cpp diff --git a/src/tools/buttonbox.h b/src/lib/tools/buttonbox.h similarity index 100% rename from src/tools/buttonbox.h rename to src/lib/tools/buttonbox.h diff --git a/src/tools/buttonwithmenu.cpp b/src/lib/tools/buttonwithmenu.cpp similarity index 100% rename from src/tools/buttonwithmenu.cpp rename to src/lib/tools/buttonwithmenu.cpp diff --git a/src/tools/buttonwithmenu.h b/src/lib/tools/buttonwithmenu.h similarity index 100% rename from src/tools/buttonwithmenu.h rename to src/lib/tools/buttonwithmenu.h diff --git a/src/tools/certificateinfowidget.cpp b/src/lib/tools/certificateinfowidget.cpp similarity index 100% rename from src/tools/certificateinfowidget.cpp rename to src/lib/tools/certificateinfowidget.cpp diff --git a/src/tools/certificateinfowidget.h b/src/lib/tools/certificateinfowidget.h similarity index 100% rename from src/tools/certificateinfowidget.h rename to src/lib/tools/certificateinfowidget.h diff --git a/src/tools/certificateinfowidget.ui b/src/lib/tools/certificateinfowidget.ui similarity index 100% rename from src/tools/certificateinfowidget.ui rename to src/lib/tools/certificateinfowidget.ui diff --git a/src/tools/clickablelabel.cpp b/src/lib/tools/clickablelabel.cpp similarity index 100% rename from src/tools/clickablelabel.cpp rename to src/lib/tools/clickablelabel.cpp diff --git a/src/tools/clickablelabel.h b/src/lib/tools/clickablelabel.h similarity index 100% rename from src/tools/clickablelabel.h rename to src/lib/tools/clickablelabel.h diff --git a/src/tools/closedtabsmanager.cpp b/src/lib/tools/closedtabsmanager.cpp similarity index 100% rename from src/tools/closedtabsmanager.cpp rename to src/lib/tools/closedtabsmanager.cpp diff --git a/src/tools/closedtabsmanager.h b/src/lib/tools/closedtabsmanager.h similarity index 100% rename from src/tools/closedtabsmanager.h rename to src/lib/tools/closedtabsmanager.h diff --git a/src/tools/docktitlebarwidget.cpp b/src/lib/tools/docktitlebarwidget.cpp similarity index 100% rename from src/tools/docktitlebarwidget.cpp rename to src/lib/tools/docktitlebarwidget.cpp diff --git a/src/tools/docktitlebarwidget.h b/src/lib/tools/docktitlebarwidget.h similarity index 100% rename from src/tools/docktitlebarwidget.h rename to src/lib/tools/docktitlebarwidget.h diff --git a/src/tools/docktitlebarwidget.ui b/src/lib/tools/docktitlebarwidget.ui similarity index 100% rename from src/tools/docktitlebarwidget.ui rename to src/lib/tools/docktitlebarwidget.ui diff --git a/src/tools/enhancedmenu.cpp b/src/lib/tools/enhancedmenu.cpp similarity index 100% rename from src/tools/enhancedmenu.cpp rename to src/lib/tools/enhancedmenu.cpp diff --git a/src/tools/enhancedmenu.h b/src/lib/tools/enhancedmenu.h similarity index 100% rename from src/tools/enhancedmenu.h rename to src/lib/tools/enhancedmenu.h diff --git a/src/tools/followredirectreply.cpp b/src/lib/tools/followredirectreply.cpp similarity index 100% rename from src/tools/followredirectreply.cpp rename to src/lib/tools/followredirectreply.cpp diff --git a/src/tools/followredirectreply.h b/src/lib/tools/followredirectreply.h similarity index 100% rename from src/tools/followredirectreply.h rename to src/lib/tools/followredirectreply.h diff --git a/src/tools/frame.cpp b/src/lib/tools/frame.cpp similarity index 100% rename from src/tools/frame.cpp rename to src/lib/tools/frame.cpp diff --git a/src/tools/frame.h b/src/lib/tools/frame.h similarity index 100% rename from src/tools/frame.h rename to src/lib/tools/frame.h diff --git a/src/tools/globalfunctions.cpp b/src/lib/tools/globalfunctions.cpp similarity index 99% rename from src/tools/globalfunctions.cpp rename to src/lib/tools/globalfunctions.cpp index b7f784d47..81a6724a1 100644 --- a/src/tools/globalfunctions.cpp +++ b/src/lib/tools/globalfunctions.cpp @@ -220,9 +220,6 @@ QString qz_buildSystem() #ifdef Q_OS_LINUX return "Linux"; #endif -#ifdef Q_OS_UNIX - return "Unix"; -#endif #ifdef Q_OS_BSD4 return "BSD 4.4"; #endif @@ -265,4 +262,10 @@ QString qz_buildSystem() #ifdef Q_OS_WIN32 return "Windows"; #endif +#ifdef Q_OS_UNIX + return "Unix"; +#endif +#ifdef Q_OS_HAIKU + return "Haiku"; +#endif } diff --git a/src/tools/globalfunctions.h b/src/lib/tools/globalfunctions.h similarity index 100% rename from src/tools/globalfunctions.h rename to src/lib/tools/globalfunctions.h diff --git a/src/tools/htmlhighlighter.cpp b/src/lib/tools/htmlhighlighter.cpp similarity index 100% rename from src/tools/htmlhighlighter.cpp rename to src/lib/tools/htmlhighlighter.cpp diff --git a/src/tools/htmlhighlighter.h b/src/lib/tools/htmlhighlighter.h similarity index 100% rename from src/tools/htmlhighlighter.h rename to src/lib/tools/htmlhighlighter.h diff --git a/src/tools/iconfetcher.cpp b/src/lib/tools/iconfetcher.cpp similarity index 100% rename from src/tools/iconfetcher.cpp rename to src/lib/tools/iconfetcher.cpp diff --git a/src/tools/iconfetcher.h b/src/lib/tools/iconfetcher.h similarity index 100% rename from src/tools/iconfetcher.h rename to src/lib/tools/iconfetcher.h diff --git a/src/tools/iconprovider.cpp b/src/lib/tools/iconprovider.cpp similarity index 100% rename from src/tools/iconprovider.cpp rename to src/lib/tools/iconprovider.cpp diff --git a/src/tools/iconprovider.h b/src/lib/tools/iconprovider.h similarity index 100% rename from src/tools/iconprovider.h rename to src/lib/tools/iconprovider.h diff --git a/src/tools/pagethumbnailer.cpp b/src/lib/tools/pagethumbnailer.cpp similarity index 100% rename from src/tools/pagethumbnailer.cpp rename to src/lib/tools/pagethumbnailer.cpp diff --git a/src/tools/pagethumbnailer.h b/src/lib/tools/pagethumbnailer.h similarity index 100% rename from src/tools/pagethumbnailer.h rename to src/lib/tools/pagethumbnailer.h diff --git a/src/tools/progressbar.cpp b/src/lib/tools/progressbar.cpp similarity index 100% rename from src/tools/progressbar.cpp rename to src/lib/tools/progressbar.cpp diff --git a/src/tools/progressbar.h b/src/lib/tools/progressbar.h similarity index 100% rename from src/tools/progressbar.h rename to src/lib/tools/progressbar.h diff --git a/src/tools/toolbutton.cpp b/src/lib/tools/toolbutton.cpp similarity index 100% rename from src/tools/toolbutton.cpp rename to src/lib/tools/toolbutton.cpp diff --git a/src/tools/toolbutton.h b/src/lib/tools/toolbutton.h similarity index 100% rename from src/tools/toolbutton.h rename to src/lib/tools/toolbutton.h diff --git a/src/tools/treewidget.cpp b/src/lib/tools/treewidget.cpp similarity index 100% rename from src/tools/treewidget.cpp rename to src/lib/tools/treewidget.cpp diff --git a/src/tools/treewidget.h b/src/lib/tools/treewidget.h similarity index 100% rename from src/tools/treewidget.h rename to src/lib/tools/treewidget.h diff --git a/src/tools/widget.cpp b/src/lib/tools/widget.cpp similarity index 100% rename from src/tools/widget.cpp rename to src/lib/tools/widget.cpp diff --git a/src/tools/widget.h b/src/lib/tools/widget.h similarity index 100% rename from src/tools/widget.h rename to src/lib/tools/widget.h diff --git a/src/webview/jsalert.ui b/src/lib/webview/jsalert.ui similarity index 100% rename from src/webview/jsalert.ui rename to src/lib/webview/jsalert.ui diff --git a/src/webview/jsconfirm.ui b/src/lib/webview/jsconfirm.ui similarity index 100% rename from src/webview/jsconfirm.ui rename to src/lib/webview/jsconfirm.ui diff --git a/src/webview/jsprompt.ui b/src/lib/webview/jsprompt.ui similarity index 100% rename from src/webview/jsprompt.ui rename to src/lib/webview/jsprompt.ui diff --git a/src/webview/popupwebview.cpp b/src/lib/webview/popupwebview.cpp similarity index 100% rename from src/webview/popupwebview.cpp rename to src/lib/webview/popupwebview.cpp diff --git a/src/webview/popupwebview.h b/src/lib/webview/popupwebview.h similarity index 100% rename from src/webview/popupwebview.h rename to src/lib/webview/popupwebview.h diff --git a/src/webview/searchtoolbar.cpp b/src/lib/webview/searchtoolbar.cpp similarity index 100% rename from src/webview/searchtoolbar.cpp rename to src/lib/webview/searchtoolbar.cpp diff --git a/src/webview/searchtoolbar.h b/src/lib/webview/searchtoolbar.h similarity index 100% rename from src/webview/searchtoolbar.h rename to src/lib/webview/searchtoolbar.h diff --git a/src/webview/searchtoolbar.ui b/src/lib/webview/searchtoolbar.ui similarity index 100% rename from src/webview/searchtoolbar.ui rename to src/lib/webview/searchtoolbar.ui diff --git a/src/webview/siteinfo.cpp b/src/lib/webview/siteinfo.cpp similarity index 100% rename from src/webview/siteinfo.cpp rename to src/lib/webview/siteinfo.cpp diff --git a/src/webview/siteinfo.h b/src/lib/webview/siteinfo.h similarity index 100% rename from src/webview/siteinfo.h rename to src/lib/webview/siteinfo.h diff --git a/src/webview/siteinfo.ui b/src/lib/webview/siteinfo.ui similarity index 100% rename from src/webview/siteinfo.ui rename to src/lib/webview/siteinfo.ui diff --git a/src/webview/siteinfowidget.cpp b/src/lib/webview/siteinfowidget.cpp similarity index 100% rename from src/webview/siteinfowidget.cpp rename to src/lib/webview/siteinfowidget.cpp diff --git a/src/webview/siteinfowidget.h b/src/lib/webview/siteinfowidget.h similarity index 100% rename from src/webview/siteinfowidget.h rename to src/lib/webview/siteinfowidget.h diff --git a/src/webview/siteinfowidget.ui b/src/lib/webview/siteinfowidget.ui similarity index 100% rename from src/webview/siteinfowidget.ui rename to src/lib/webview/siteinfowidget.ui diff --git a/src/webview/tabbar.cpp b/src/lib/webview/tabbar.cpp similarity index 100% rename from src/webview/tabbar.cpp rename to src/lib/webview/tabbar.cpp diff --git a/src/webview/tabbar.h b/src/lib/webview/tabbar.h similarity index 100% rename from src/webview/tabbar.h rename to src/lib/webview/tabbar.h diff --git a/src/webview/tabbedwebview.cpp b/src/lib/webview/tabbedwebview.cpp similarity index 100% rename from src/webview/tabbedwebview.cpp rename to src/lib/webview/tabbedwebview.cpp diff --git a/src/webview/tabbedwebview.h b/src/lib/webview/tabbedwebview.h similarity index 100% rename from src/webview/tabbedwebview.h rename to src/lib/webview/tabbedwebview.h diff --git a/src/webview/tabwidget.cpp b/src/lib/webview/tabwidget.cpp similarity index 100% rename from src/webview/tabwidget.cpp rename to src/lib/webview/tabwidget.cpp diff --git a/src/webview/tabwidget.h b/src/lib/webview/tabwidget.h similarity index 100% rename from src/webview/tabwidget.h rename to src/lib/webview/tabwidget.h diff --git a/src/webview/webhistorywrapper.cpp b/src/lib/webview/webhistorywrapper.cpp similarity index 100% rename from src/webview/webhistorywrapper.cpp rename to src/lib/webview/webhistorywrapper.cpp diff --git a/src/webview/webhistorywrapper.h b/src/lib/webview/webhistorywrapper.h similarity index 100% rename from src/webview/webhistorywrapper.h rename to src/lib/webview/webhistorywrapper.h diff --git a/src/webview/webinspectordockwidget.cpp b/src/lib/webview/webinspectordockwidget.cpp similarity index 100% rename from src/webview/webinspectordockwidget.cpp rename to src/lib/webview/webinspectordockwidget.cpp diff --git a/src/webview/webinspectordockwidget.h b/src/lib/webview/webinspectordockwidget.h similarity index 100% rename from src/webview/webinspectordockwidget.h rename to src/lib/webview/webinspectordockwidget.h diff --git a/src/webview/webpage.cpp b/src/lib/webview/webpage.cpp similarity index 100% rename from src/webview/webpage.cpp rename to src/lib/webview/webpage.cpp diff --git a/src/webview/webpage.h b/src/lib/webview/webpage.h similarity index 100% rename from src/webview/webpage.h rename to src/lib/webview/webpage.h diff --git a/src/webview/webtab.cpp b/src/lib/webview/webtab.cpp similarity index 100% rename from src/webview/webtab.cpp rename to src/lib/webview/webtab.cpp diff --git a/src/webview/webtab.h b/src/lib/webview/webtab.h similarity index 100% rename from src/webview/webtab.h rename to src/lib/webview/webtab.h diff --git a/src/webview/webview.cpp b/src/lib/webview/webview.cpp similarity index 100% rename from src/webview/webview.cpp rename to src/lib/webview/webview.cpp diff --git a/src/webview/webview.h b/src/lib/webview/webview.h similarity index 100% rename from src/webview/webview.h rename to src/lib/webview/webview.h diff --git a/src/webview/webviewsettings.cpp b/src/lib/webview/webviewsettings.cpp similarity index 100% rename from src/webview/webviewsettings.cpp rename to src/lib/webview/webviewsettings.cpp diff --git a/src/webview/webviewsettings.h b/src/lib/webview/webviewsettings.h similarity index 100% rename from src/webview/webviewsettings.h rename to src/lib/webview/webviewsettings.h diff --git a/src/Info.plist b/src/main/Info.plist similarity index 100% rename from src/Info.plist rename to src/main/Info.plist diff --git a/src/appicon.rc b/src/main/appicon.rc similarity index 100% rename from src/appicon.rc rename to src/main/appicon.rc diff --git a/src/appicon_os2.rc b/src/main/appicon_os2.rc similarity index 100% rename from src/appicon_os2.rc rename to src/main/appicon_os2.rc diff --git a/src/main.cpp b/src/main/main.cpp similarity index 100% rename from src/main.cpp rename to src/main/main.cpp diff --git a/src/main/main.pro b/src/main/main.pro new file mode 100644 index 000000000..4dc6ffe72 --- /dev/null +++ b/src/main/main.pro @@ -0,0 +1,25 @@ +QT += core gui webkit sql network script +unix: QT += dbus + +TARGET = qupzilla +TEMPLATE = app +LIBS += -L../../bin -lqupzilla + +include(../defines.pri) +include(../install.pri) +include(../../translations/translations.pri) + +INCLUDEPATH += ../lib/app\ + ../lib/3rdparty + +SOURCES = main.cpp +OTHER_FILES += appicon.rc \ + appicon_os2.rc \ + Info.plist + +os2:RC_FILE = appicon_os2.rc +win32:RC_FILE = appicon.rc + +unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_RPATHDIR += $$PWD/../../bin + +message(========== Building qupzilla binary ==========) diff --git a/src/plugins.pri b/src/plugins.pri new file mode 100644 index 000000000..faf298f50 --- /dev/null +++ b/src/plugins.pri @@ -0,0 +1,48 @@ +include(defines.pri) + +INCLUDEPATH += $$PWD/lib/3rdparty\ + $$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/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/bookmarksimport\ + $$PWD/lib/popupwindow\ + +TEMPLATE = lib +CONFIG += plugin +DESTDIR = $$PWD/../bin/plugins/ + +OBJECTS_DIR = build +MOC_DIR = build +RCC_DIR = build +UI_DIR = build + +LIBS += -L $$PWD/../bin -lqupzilla + +!mac:unix { + target.path = $$library_folder/qupzilla + + INSTALLS += target +} + +updateqm.input = TRANSLATIONS +updateqm.output = locale/${QMAKE_FILE_BASE}.qm +updateqm.commands = $$QMAKE_LRELEASE -silent ${QMAKE_FILE_IN} -qm locale/${QMAKE_FILE_BASE}.qm +updateqm.CONFIG += no_link target_predeps +QMAKE_EXTRA_COMPILERS += updateqm diff --git a/src/plugins/TestPlugin/TestPlugin.pro b/src/plugins/TestPlugin/TestPlugin.pro new file mode 100644 index 000000000..bf198c04c --- /dev/null +++ b/src/plugins/TestPlugin/TestPlugin.pro @@ -0,0 +1,23 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2011-02-13T10:23:13 +# +#------------------------------------------------- +QT += network webkit sql +TARGET = ExamplePlugin + +SOURCES += testplugin.cpp +HEADERS += testplugin.h +RESOURCES += testplugin.qrc + +TRANSLATIONS += translations/cs_CZ.ts\ + translations/sk_SK.ts\ + translations/sr_BA.ts\ + translations/sr_RS.ts\ + translations/de_DE.ts\ + translations/el_GR.ts\ + translations/id_ID.ts\ + translations/zh_CN.ts\ + translations/zh_TW.ts\ + +include(../../plugins.pri) diff --git a/plugins/TestPlugin/testplugin.cpp b/src/plugins/TestPlugin/testplugin.cpp similarity index 98% rename from plugins/TestPlugin/testplugin.cpp rename to src/plugins/TestPlugin/testplugin.cpp index 910b7fedf..be0fccff2 100644 --- a/plugins/TestPlugin/testplugin.cpp +++ b/src/plugins/TestPlugin/testplugin.cpp @@ -51,7 +51,7 @@ bool TestPlugin::testPlugin() QTranslator* TestPlugin::getTranslator(const QString &locale) { QTranslator* translator = new QTranslator(); - translator->load(":/testplugin/" + locale); + translator->load(":/testplugin/locale/" + locale); return translator; } diff --git a/plugins/TestPlugin/testplugin.h b/src/plugins/TestPlugin/testplugin.h similarity index 100% rename from plugins/TestPlugin/testplugin.h rename to src/plugins/TestPlugin/testplugin.h diff --git a/src/plugins/TestPlugin/testplugin.qrc b/src/plugins/TestPlugin/testplugin.qrc new file mode 100644 index 000000000..2e2eefd39 --- /dev/null +++ b/src/plugins/TestPlugin/testplugin.qrc @@ -0,0 +1,12 @@ + + + locale/cs_CZ.qm + locale/de_DE.qm + locale/el_GR.qm + locale/sk_SK.qm + locale/sr_BA.qm + locale/sr_RS.qm + locale/zh_CN.qm + locale/zh_TW.qm + + diff --git a/plugins/TestPlugin/cs_CZ.ts b/src/plugins/TestPlugin/translations/cs_CZ.ts similarity index 100% rename from plugins/TestPlugin/cs_CZ.ts rename to src/plugins/TestPlugin/translations/cs_CZ.ts diff --git a/plugins/TestPlugin/de_DE.ts b/src/plugins/TestPlugin/translations/de_DE.ts similarity index 100% rename from plugins/TestPlugin/de_DE.ts rename to src/plugins/TestPlugin/translations/de_DE.ts diff --git a/plugins/TestPlugin/el_GR.ts b/src/plugins/TestPlugin/translations/el_GR.ts similarity index 100% rename from plugins/TestPlugin/el_GR.ts rename to src/plugins/TestPlugin/translations/el_GR.ts diff --git a/plugins/TestPlugin/id_ID.ts b/src/plugins/TestPlugin/translations/id_ID.ts similarity index 100% rename from plugins/TestPlugin/id_ID.ts rename to src/plugins/TestPlugin/translations/id_ID.ts diff --git a/plugins/TestPlugin/sk_SK.ts b/src/plugins/TestPlugin/translations/sk_SK.ts similarity index 100% rename from plugins/TestPlugin/sk_SK.ts rename to src/plugins/TestPlugin/translations/sk_SK.ts diff --git a/plugins/TestPlugin/sr_BA.ts b/src/plugins/TestPlugin/translations/sr_BA.ts similarity index 100% rename from plugins/TestPlugin/sr_BA.ts rename to src/plugins/TestPlugin/translations/sr_BA.ts diff --git a/plugins/TestPlugin/sr_RS.ts b/src/plugins/TestPlugin/translations/sr_RS.ts similarity index 100% rename from plugins/TestPlugin/sr_RS.ts rename to src/plugins/TestPlugin/translations/sr_RS.ts diff --git a/plugins/TestPlugin/zh_CN.ts b/src/plugins/TestPlugin/translations/zh_CN.ts similarity index 100% rename from plugins/TestPlugin/zh_CN.ts rename to src/plugins/TestPlugin/translations/zh_CN.ts diff --git a/plugins/TestPlugin/zh_TW.ts b/src/plugins/TestPlugin/translations/zh_TW.ts similarity index 100% rename from plugins/TestPlugin/zh_TW.ts rename to src/plugins/TestPlugin/translations/zh_TW.ts diff --git a/plugins/plugins.pro b/src/plugins/plugins.pro similarity index 100% rename from plugins/plugins.pro rename to src/plugins/plugins.pro diff --git a/src/src.pro b/src/src.pro index 15bea6acd..59cb83bda 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,20 +1,5 @@ -QT += core gui webkit sql network script -unix:QT += dbus -TARGET = qupzilla -TEMPLATE = lib +TEMPLATE = subdirs +SUBDIRS = lib main +build_plugins: SUBDIRS += plugins -include(3rdparty/qtsingleapplication.pri) -include(src.pri) -include(../defines.pri) - -SOURCES -= main.cpp - -!mac:unix { - target.path = $$library_folder - - INSTALLS += target -} - -message(========== Building libqupzilla ==========) -message( Using following defines:) -message($$DEFINES) +CONFIG += ordered diff --git a/translations.pri b/translations.pri deleted file mode 100644 index f7024739c..000000000 --- a/translations.pri +++ /dev/null @@ -1,33 +0,0 @@ -TRANSLATIONS += $$PWD/translations/cs_CZ.ts\ - $$PWD/translations/sk_SK.ts\ - $$PWD/translations/de_DE.ts\ - $$PWD/translations/nl_NL.ts\ - $$PWD/translations/zh_CN.ts\ - $$PWD/translations/zh_TW.ts\ - $$PWD/translations/it_IT.ts\ - $$PWD/translations/pl_PL.ts\ - $$PWD/translations/es_ES.ts\ - $$PWD/translations/fr_FR.ts\ - $$PWD/translations/el_GR.ts\ - $$PWD/translations/ru_RU.ts\ - $$PWD/translations/pt_PT.ts\ - $$PWD/translations/sr_BA.ts\ - $$PWD/translations/sr_RS.ts\ - $$PWD/translations/sv_SE.ts\ - $$PWD/translations/id_ID.ts\ - -isEmpty(QMAKE_LRELEASE) { - win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe - else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease - unix { - !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 } - } else { - !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } - } -} - -updateqm.input = TRANSLATIONS -updateqm.output = $$PWD/bin/locale/${QMAKE_FILE_BASE}.qm -updateqm.commands = $$QMAKE_LRELEASE -silent ${QMAKE_FILE_IN} -qm $$PWD/bin/locale/${QMAKE_FILE_BASE}.qm -updateqm.CONFIG += no_link target_predeps -QMAKE_EXTRA_COMPILERS += updateqm diff --git a/translations/homepage/de_DE.php b/translations/homepage/de_DE.php index 118eeca33..b78716f4a 100644 --- a/translations/homepage/de_DE.php +++ b/translations/homepage/de_DE.php @@ -1,4 +1,4 @@ -" //Home Page $actual_version = "Versione corrente"; $actual_version_text = "La versione corrente è stata rilasciata il ". $qupzilla_version_date . - " ed è la versione " . $qupzilla_version . ". L'elenco dei cambiamenti è disponibile nel changelog.
Non esitare e scaricalo adesso!"; + " ed è la versione " . $qupzilla_version . ". Cambiamenti nel changelog.
Non esitare e scaricalo adesso!"; $actual_version_button = "DOWNLOAD"; $older_versions = "Changelog"; -$older_versions_text = "Ti sei mai chiesto cosa succede tra una versione l'altra?
Puoi trovare tutto nel changelog su github!"; +$older_versions_text = "Ti sei mai chiesto cosa succede tra una versione e l'altra?
Puoi trovare tutto nel changelog su github!"; $older_versions_button = "Changelog"; $reportbug = "Apri una segnalazione"; $reportbug_text = "Hai trovato un bug o vuoi solo proporre dei suggerimenti per migliorare QupZilla?
@@ -26,7 +26,7 @@ $reportbug_text = "Hai trovato un bug o vuoi solo proporre dei suggerimenti per $reportbug_button = "Riporta adesso"; $technology = "Tecnologia"; $technology_text = "QupZilla è un browser web moderno basato su piattaforma WebKit e Framework Qt. WebKit garantisce una navigazione veloce - e l'utilizzabilità delle Qt su tutte le maggiori piattaforme."; + e Qt l'utilizzabilità su tutte le maggiori piattaforme."; $technology_button = "WebKit & Qt"; $looknfeel_header = "Aspetto nativo"; $looknfeel_text = "QupZilla utilizza lo stile nativo delle applicazioni sui principali Desktop Environment di Linux. Utilizza inoltre le icone del tema attivo. Se credi che i temi nativi siano noiosi o se ti danno qualche problema, puoi sempre scegliere tra altri temi."; @@ -34,9 +34,9 @@ $library_header = "Libreria unificata"; $library_text = "QupZilla unifica segnalibri, cronologia e lettore di fonti in un'unica finestra. Niente più finestre multiple, QupZilla ne usa solo una!
Con il lettore di fonti integrato, puoi rimanere aggiornato sui tuoi siti preferiti. QupZilla può anche importare i segnalibri da altri browser."; $adblock_header = "Filtro AdBlock integrato"; -$adblock_text = "Sei stanco dei siti pieni di pubblicità? Consumano la tua banda ed il tuo tempo? L'unica cosa di cui hai bisogno con QupZilla è aggiornare la lista EasyListis o aggiungere le tue regole personali ed iniziare a navigare libero dalla pubblicità."; +$adblock_text = "Sei stanco dei siti pieni di pubblicità, che consumano la tua banda ed il tuo tempo? L'unica cosa che devi fare con QupZilla è aggiornare la lista EasyList o aggiungere le tue regole personalizzate ed iniziare a navigare libero dalla pubblicità."; $speeddial_header = "Speed Dial"; -$speeddial_text = "Questa famosa estensione è finalmente disponibile per gli utenti di QupZilla! Ora puoi accedere alle tue pagine preferite velocemente come vorresti in una pagina aperta in una nuova scheda. Inutile dire che supporta appieno il drag&drop e il caricamento dell'anteprima delle pagine."; +$speeddial_text = "Questa famosa estensione è finalmente disponibile per gli utenti di QupZilla! Ora puoi accedere alle tue pagine preferite velocemente come vorresti, in una pagina aperta in una nuova scheda. Inutile dire che supporta appieno il drag&drop e il caricamento dell'anteprima delle pagine."; $devnews_header = "Notizie sullo sviluppo"; $feed_loading = "Caricamento..."; @@ -60,14 +60,14 @@ $contribute_to = "Contribuisci a QupZilla"; $contribute_text = "QupZilla è un progetto open source, quindi il tuo aiuto è molto gradito! Sarò molto felice di includere le correzioni che mi manderai. Ma l'hacking del codice non è l'unico modo per aiutare: puoi tradurre QupZilla nella tua lingua o semplicemente condividerlo con i tuoi amici. Ricorda, ogni aiuto (anche piccolo) è molto apprezzato!"; $getting_source = "Ottenere i sorgenti"; -$getting_source_text1 = "Il modo più semplice per ottenere i sorgenti di QupZilla è clonarlo dal repository github. Puoi farlo eseguendo questo comando"; +$getting_source_text1 = "Il modo più semplice per ottenere i sorgenti di QupZilla è clonarli dal repository github. Puoi farlo eseguendo questo comando"; $getting_source_text2 = "e poi puoi iniziare l'hacking. Puoi inviarmi le correzioni via e-mail o su github."; $translating = "Tradurre in atre lingue"; $translating_text = "Un altro modo per contribuire è aggiungere traduzioni o migliorare quelle attuali. Se vuoi aggiungere una nuova traduzione, puoi generare manualmente il nuovo file di traduzione, o puoi contattarmi e lo farò io per te. Puoi inviarmi anche le traduzioni via e-mail o su github."; -$translating_moreinfo = "Maggiori informazioni sulla traduzione qui [wiki su github]"; +$translating_moreinfo = "Maggiori informazioni sulla traduzione qui [wiki at github]"; $creators = "Chi crea QupZilla?"; $creators_text = "Il proprietario, mantenitore e sviluppatore principale del progetto è lo studente Ceco David Rosca (nowrep).
Oltre alla programmazione, anche altre persone contribuiscono a QupZilla, traducendolo o supportandolo. La lista completa dei collaboratori può essere trovata qui [su github].

Puoi anche collegarti al canale IRC #qupzilla su irc.freenode.net per parlare con le persone coinvolte in QupZilla."; $share_with_friends = "Dillo ai tuoi amici!"; -$share_with_friends_text = "Ti piace QupZilla? Allora condividilo con i tuoi amici!"; +$share_with_friends_text = "Ti piace QupZilla? Allora condividilo con i tuoi amici!" ?> diff --git a/translations/homepage/pl_PL.php b/translations/homepage/pl_PL.php index 85c79f331..c69205cba 100644 --- a/translations/homepage/pl_PL.php +++ b/translations/homepage/pl_PL.php @@ -1,4 +1,4 @@ - Show Only Icons - + Toon alleen pictogrammen @@ -853,7 +853,7 @@ Remove - Verwijder + Verwijder @@ -1120,7 +1120,7 @@ Stored Cookies - + Opgeslagen cookies @@ -1198,39 +1198,39 @@ Cookie Filtering - + Cookie-filtering <b>Cookie whitelist</b> - + <b>Cookies: witte lijst</b> Cookies from these servers will ALWAYS be accepted (even if you have disabled saving cookies) - + Cookies van deze servers zullen ALTIJD worden geaccepteerd (ook als u cookies opslaan uitgeschakeld heeft) Add - Voeg toe + Voeg toe Remove - Verwijder + Verwijder <b>Cookie blacklist</b> - + <b>Cookies: zwarte lijst</b> Cookies from these servers will NEVER be accepted - + Cookies van deze servers zullen NOOIT worden geaccepteerd @@ -1255,12 +1255,12 @@ Add to whitelist - + Voeg toe aan witte lijst Add to blacklist - + Voeg toe aan zwarte lijst @@ -3068,7 +3068,7 @@ werd niet gevonden! Configuration Information - + Informatie over configuratie @@ -3399,7 +3399,7 @@ werd niet gevonden! Configuration Information - + Informatie over configuratie @@ -3431,12 +3431,12 @@ werd niet gevonden! Application version - + Programma-versie Qt version - + Qt-versie @@ -3456,32 +3456,32 @@ werd niet gevonden! Preferences - Instellingen + Instellingen Option - + Optie Value - Waarde + Waarde Name - + Naam Author - + Auteur Description - + Beschrijving @@ -3527,7 +3527,7 @@ werd niet gevonden! E-mail is optional<br/><b>Note: </b>Please read how to make a bug report <a href=%1>here</a> first. - + E-mail is optioneel<br/><b>Noot: </b>Lees alstublieft eerst hoe een bug-rapportage aan te maken<a href=%1>here</a>. @@ -3612,12 +3612,12 @@ werd niet gevonden! This page contains information about QupZilla's current configuration, plugins, etc, all relevant information for troubleshooting. Please include these information when sending bug reports. - + Deze pagina bevast informatie over QupZilla's huidige configuratie, plugins, etc, alle relevante informatie voor probleemoplossing. Vermeld deze alstublieft bij het verzenden van bugrapportages. No available plugins. - + Geen beschikbare plugins. diff --git a/translations/translations.pri b/translations/translations.pri new file mode 100644 index 000000000..6afac5ffa --- /dev/null +++ b/translations/translations.pri @@ -0,0 +1,25 @@ +TRANSLATIONS += $$PWD/cs_CZ.ts\ + $$PWD/sk_SK.ts\ + $$PWD/de_DE.ts\ + $$PWD/nl_NL.ts\ + $$PWD/zh_CN.ts\ + $$PWD/zh_TW.ts\ + $$PWD/it_IT.ts\ + $$PWD/pl_PL.ts\ + $$PWD/es_ES.ts\ + $$PWD/fr_FR.ts\ + $$PWD/el_GR.ts\ + $$PWD/ru_RU.ts\ + $$PWD/pt_PT.ts\ + $$PWD/sr_BA.ts\ + $$PWD/sr_RS.ts\ + $$PWD/sv_SE.ts\ + $$PWD/id_ID.ts\ + +include(../src/defines.pri) + +updateqm.input = TRANSLATIONS +updateqm.output = $$PWD/../bin/locale/${QMAKE_FILE_BASE}.qm +updateqm.commands = $$QMAKE_LRELEASE -silent ${QMAKE_FILE_IN} -qm $$PWD/../bin/locale/${QMAKE_FILE_BASE}.qm +updateqm.CONFIG += no_link target_predeps +QMAKE_EXTRA_COMPILERS += updateqm