Merge branch 'master' into brute4s99/swish

Authored by brute4s99 on Jun 21 2019, 12:44 PM.

Description

Merge branch 'master' into brute4s99/swish

Details

Committed
brute4s99Jun 21 2019, 12:44 PM
Parents
R877:72363c668e4a: same with washer
R877:98dcceb751d9: Don't look for xlocale on windows
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
98dcceb751d9vonreth
Don't look for xlocale on windows 
Jun 21 2019
889e8ef23232vonreth
Qt update to 5.12.4 
Jun 20 2019
0ed6c8b9bfcfbrute4s99
Revert "add comet and remove deprecated key from kdeconenct-kde" 
Jun 20 2019
4bc4c7859cb1brute4s99
add comet and remove deprecated key from kdeconenct-kde 
Jun 19 2019
1d6e51fc14a8vonreth
Reenable kdewebkit with mingw 
Jun 18 2019
b895479229e4vonreth
Build qtwebkit with mingw in release mode by default 
Jun 18 2019
79aa07d5a34dvonreth
Looks like qtwebkit was fixed for mingw 
Jun 18 2019
1365377232b8vonreth
Revert "remove phonon from deps if building for win32" 
Jun 18 2019
ecdf72305258D21657brute4s99
remove phonon from deps if building for win32 
Jun 18 2019
319e159d255cvonreth
Prepare Qt 5.12.4 
Jun 18 2019
6d2bde3d38a5vonreth
Fix dep 
Jun 17 2019
3b0c2672418dvonreth
Fix perl on windows, readd the postInstall step where we fix the install prefix 
Jun 17 2019