Diffusion Kexi d29faa79be81

Merge branch 'cool_main_window-staniek3' into cool_main_window-staniek5

Authored by staniek on Mar 17 2017, 1:44 AM.

Description

Merge branch 'cool_main_window-staniek3' into cool_main_window-staniek5

  1. Conflicts:
  2. src/core/CMakeLists.txt
  3. src/formeditor/CMakeLists.txt
  4. src/formeditor/WidgetTreeWidget.cpp
  5. src/formeditor/formIO.cpp
  6. src/kexiutils/KexiTestHandler.cpp
  7. src/kexiutils/style/KexiPropertyPaneLineEditStyle.h
  8. src/main/KexiMainWindow.h
  9. src/main/KexiMainWindow_p.cpp
  10. src/main/autotests/GlobalSearchTest.h
  11. src/migration/importwizard.cpp
  12. src/pics/kexi_breeze_files.cmake
  13. src/plugins/forms/CMakeLists.txt
  14. src/plugins/forms/kexiformview.cpp
  15. src/plugins/forms/widgets/kexidbutils.cpp
  16. src/plugins/queries/kexiquerydesignerguieditor.cpp
  17. src/plugins/reports/KexiDBReportDataSource.cpp
  18. src/plugins/tables/kexitablepart.cpp
  19. src/widget/KexiObjectInfoLabel.cpp
  20. src/widget/dataviewcommon/kexidataprovider.cpp
  21. src/widget/kexiqueryparameters.cpp

Details

Committed
staniekMar 17 2017, 1:44 AM
Differential Revision
D11778: Cool main window for KEXI 3.2
Parents
R71:ca95772bebe2: Merge branch 'cool_main_window-staniek3' into cool_main_window-staniek5
Branches
Unknown
Tags
Unknown