Fix the order of default Qt version
It seems both Qt and cmake documentations are incorrect about the order used in NAMES keyword
This commit is contained in:
		
							parent
							
								
									125b9571c5
								
							
						
					
					
						commit
						609e21643b
					
				
					 1 changed files with 4 additions and 1 deletions
				
			
		
							
								
								
									
										5
									
								
								external/qt/package.cmake
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								external/qt/package.cmake
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -25,7 +25,10 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
 | 
				
			||||||
endif()
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if (NOT DEFINED QT_VERSION_MAJOR)
 | 
					if (NOT DEFINED QT_VERSION_MAJOR)
 | 
				
			||||||
    find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 | 
					    find_package(QT NAMES Qt6 COMPONENTS Core)
 | 
				
			||||||
 | 
					    if (NOT QT_FOUND)
 | 
				
			||||||
 | 
					        find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED)
 | 
				
			||||||
 | 
					    endif()
 | 
				
			||||||
endif()
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets Network Svg REQUIRED)
 | 
					find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets Network Svg REQUIRED)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue