Merge branch 'master' into cool_main_window-staniek6
- Conflicts:
- src/kexiutils/CMakeLists.txt
- src/main/KexiMainWindow.cpp
- src/main/KexiMainWindow.h
- src/main/KexiMainWindow_p.cpp
- src/main/KexiMainWindow_p.h
- src/main/startup/KexiStartupDialog.cpp
- src/plugins/forms/kexidatasourcepage.cpp
- src/plugins/forms/kexidatasourcepage.h
- src/plugins/forms/kexiformview.cpp
- src/plugins/forms/widgets/kexidbform.cpp
- src/plugins/importexport/csv/kexicsvexport.cpp
- src/plugins/importexport/csv/kexicsvexportwizard.cpp
- src/plugins/queries/kexiquerydesignerguieditor.cpp
- src/plugins/queries/kexiquerypart.cpp
- src/plugins/queries/kexiquerypart.h
- src/plugins/queries/kexiqueryview.cpp
- src/plugins/reports/KexiDBReportDataSource.cpp
- src/plugins/reports/kexireportpart.cpp
- src/plugins/reports/kexireportview.cpp
- src/plugins/scripting/kexidb/kexidbconnection.cpp
- src/plugins/scripting/kexidb/kexidbmodule.cpp
- src/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
- src/plugins/scripting/kexiscripting/kexiscriptpart.cpp
- src/plugins/tables/kexitabledesignerview.cpp
- src/plugins/tables/kexitablepart.cpp
- src/tests/newapi/main.cpp
- src/tests/startup/main.cpp
- src/widget/KexiFileWidget.cpp
- src/widget/KexiStartupFileHandler.cpp
- src/widget/dataviewcommon/kexidataprovider.cpp
- src/widget/tableview/KexiTableScrollArea.cpp
- src/widget/tableview/kexicomboboxpopup.cpp