Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use QML 5.12 everywhere. #4119

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admin/osx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ else()
set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
endif()

find_package(Qt5 5.15 COMPONENTS Core REQUIRED)
find_package(Qt5 5.12 COMPONENTS Core REQUIRED)
configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
Expand Down
2 changes: 1 addition & 1 deletion shell_integration/dolphin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project(dolphin-owncloud)

cmake_minimum_required(VERSION 2.8.12)

set(QT_MIN_VERSION "5.15.0")
set(QT_MIN_VERSION "5.12.0")
set(KF5_MIN_VERSION "5.16.0")
set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Install the plugin in the right directory")

Expand Down
2 changes: 1 addition & 1 deletion shell_integration/libcloudproviders/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ macro(libcloudproviders_add_config _sources)
endmacro(libcloudproviders_add_config _sources)


find_package(Qt5 5.15 COMPONENTS DBus)
find_package(Qt5 5.12 COMPONENTS DBus)
IF (Qt5DBus_FOUND)
STRING(TOLOWER "${APPLICATION_VENDOR}" DBUS_VENDOR)
STRING(REGEX REPLACE "[^A-z0-9]" "" DBUS_VENDOR "${DBUS_VENDOR}")
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ endif()

include(ECMEnableSanitizers)

find_package(Qt5 5.15 COMPONENTS Core Network Xml Concurrent REQUIRED)
find_package(Qt5 5.15 COMPONENTS WebEngineWidgets WebEngine)
find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent REQUIRED)
find_package(Qt5 5.12 COMPONENTS WebEngineWidgets WebEngine)

if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
add_compile_definitions(WITH_WEBENGINE=1)
Expand Down
4 changes: 2 additions & 2 deletions src/gui/EmojiPicker.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* for more details.
*/

import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15

import com.nextcloud.desktopclient 1.0 as NC
Expand Down
2 changes: 1 addition & 1 deletion src/gui/ErrorBox.qml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick 2.12

import Style 1.0

Expand Down
4 changes: 2 additions & 2 deletions src/gui/UserStatusSelector.qml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import QtQuick 2.6
import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtQuick.Window 2.15
import QtQuick.Controls 2.12
import QtQuick.Window 2.12
import com.nextcloud.desktopclient 1.0 as NC

ColumnLayout {
Expand Down
2 changes: 1 addition & 1 deletion src/gui/UserStatusSelectorDialog.qml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick.Window 2.15
import QtQuick.Window 2.12

import com.nextcloud.desktopclient 1.0 as NC

Expand Down
4 changes: 2 additions & 2 deletions src/gui/tray/ActivityList.qml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick 2.12
import QtQuick.Controls 2.12

import Style 1.0

Expand Down
2 changes: 1 addition & 1 deletion src/gui/tray/AutoSizingMenu.qml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick 2.12
import QtQuick.Controls 2.3

Menu {
Expand Down
2 changes: 1 addition & 1 deletion src/gui/tray/FileActivityDialog.qml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick.Window 2.15
import QtQuick.Window 2.12

import com.nextcloud.desktopclient 1.0 as NC

Expand Down
4 changes: 2 additions & 2 deletions src/gui/tray/SyncStatus.qml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15

import Style 1.0
Expand Down
4 changes: 2 additions & 2 deletions src/gui/tray/UnifiedSearchInputContainer.qml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQml 2.15
import QtQuick 2.15
import QtQml 2.12
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtGraphicalEffects 1.0
import Style 1.0
Expand Down
4 changes: 2 additions & 2 deletions src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQml 2.15
import QtQuick 2.15
import QtQml 2.12
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.2
import Style 1.0
Expand Down
2 changes: 1 addition & 1 deletion src/gui/tray/UnifiedSearchResultItem.qml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQml 2.15
import QtQml 2.12
import QtQuick 2.9
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.2
Expand Down
4 changes: 2 additions & 2 deletions src/gui/tray/UnifiedSearchResultItemSkeleton.qml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQml 2.15
import QtQuick 2.15
import QtQml 2.12
import QtQuick 2.12
import QtQuick.Layouts 1.2
import Style 1.0

Expand Down
4 changes: 2 additions & 2 deletions src/gui/tray/UnifiedSearchResultItemSkeletonContainer.qml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQml 2.15
import QtQuick 2.15
import QtQml 2.12
import QtQuick 2.12
import QtQuick.Controls 2.3
import Style 1.0

Expand Down
4 changes: 2 additions & 2 deletions src/gui/tray/UnifiedSearchResultListItem.qml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQml 2.15
import QtQuick 2.15
import QtQml 2.12
import QtQuick 2.12
import QtQuick.Controls 2.3
import Style 1.0

Expand Down
4 changes: 2 additions & 2 deletions src/gui/tray/UnifiedSearchResultNothingFound.qml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQml 2.15
import QtQuick 2.15
import QtQml 2.12
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.2
import Style 1.0
Expand Down
6 changes: 3 additions & 3 deletions src/gui/tray/UnifiedSearchResultSectionItem.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQml 2.15
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQml 2.12
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.2
import Style 1.0

Expand Down
4 changes: 2 additions & 2 deletions src/gui/tray/Window.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQml 2.12
import QtQml.Models 2.1
import QtQuick 2.15
import QtQuick 2.12
import QtQuick.Window 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.2
Expand Down Expand Up @@ -675,7 +675,7 @@ Window {

keyNavigationEnabled: true

reuseItems: true
//TODO: enable it when Qt 5.15 is available for every OS reuseItems: true

Accessible.role: Accessible.List
Accessible.name: qsTr("Unified search results list")
Expand Down