Rearranged directory structure. All sources are under src/ dir now.

- updated Italian homepage translation

QupZilla.pro

@@ -11,6 +11,4 @@ lessThan(QT_VERSION, 4.7) {
 }
 
 TEMPLATE = subdirs
-SUBDIRS = src main
+SUBDIRS = src
-build_plugins: SUBDIRS += plugins
-CONFIG += ordered

install.pri

@@ -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
-}

main/main.pro

@@ -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 ==========)

plugins.pri

@@ -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
-}

plugins/TestPlugin/TestPlugin.pro

@@ -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)

plugins/TestPlugin/testplugin.qrc

@@ -1,10 +0,0 @@
-<RCC>
-    <qresource prefix="/testplugin">
-        <file>cs_CZ.qm</file>
-        <file>sk_SK.qm</file>
-        <file>sr_BA.qm</file>
-        <file>sr_RS.qm</file>
-        <file>de_DE.qm</file>
-        <file>el_GR.qm</file>
-    </qresource>
-</RCC>

src/defines.pri

@@ -1,8 +1,8 @@
-DESTDIR = $$PWD/bin
+DESTDIR = $$PWD/../bin
-OBJECTS_DIR = $$PWD/build
+OBJECTS_DIR = $$PWD/../build
-MOC_DIR = $$PWD/build
+MOC_DIR = $$PWD/../build
-RCC_DIR = $$PWD/build
+RCC_DIR = $$PWD/../build
-UI_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 }
+    }
+}

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
+}