Merge branch 'master' into fix-option-scaling
This commit is contained in:
		
						commit
						faf67b87cd
					
				
							
								
								
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							@ -74,7 +74,7 @@ jobs:
 | 
			
		||||
          cd QtApng
 | 
			
		||||
          cd src/3rdparty
 | 
			
		||||
          chmod +x get_libs.sh
 | 
			
		||||
          ./get_libs.sh 1.2.13 1.6.37
 | 
			
		||||
          ./get_libs.sh 1.3 1.6.37
 | 
			
		||||
          cd ../..
 | 
			
		||||
          qmake CONFIG+=install_ok QMAKE_CXXFLAGS+="-fno-sized-deallocation" QT_PLATFORM=${{matrix.platform}}
 | 
			
		||||
          ${{steps.qt.outputs.make}} qmake_all
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user