diff options
| author | Martchus | 2016-03-28 19:52:10 +0200 |
|---|---|---|
| committer | Martchus | 2016-03-28 19:52:10 +0200 |
| commit | dabae9421ba89f01d529aa1d7f53836ac72377fb (patch) | |
| tree | 04788b794209b76214f10500e33f8eca1c010694 /qt5-rename-qtmain-to-qt5main.patch | |
| parent | 3564bd5b15c3cd1825795965e2f17a52a227d60e (diff) | |
| download | aur-dabae9421ba89f01d529aa1d7f53836ac72377fb.tar.gz | |
updated to 5.6.0
Diffstat (limited to 'qt5-rename-qtmain-to-qt5main.patch')
| -rw-r--r-- | qt5-rename-qtmain-to-qt5main.patch | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/qt5-rename-qtmain-to-qt5main.patch b/qt5-rename-qtmain-to-qt5main.patch index 57c35da0f56f..f65ad31ecaaa 100644 --- a/qt5-rename-qtmain-to-qt5main.patch +++ b/qt5-rename-qtmain-to-qt5main.patch @@ -9,26 +9,14 @@ DESTDIR = $$QT.core.libs CONFIG += static ---- qtbase-opensource-src-5.2.1/mkspecs/features/create_cmake.prf.orig 2014-04-29 18:53:49.511932034 +0200 -+++ qtbase-opensource-src-5.2.1/mkspecs/features/create_cmake.prf 2014-04-29 18:54:44.515819011 +0200 -@@ -203,8 +203,8 @@ - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll - - mingw { -- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a -- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a -+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a -+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a - - !isEmpty(CMAKE_STATIC_TYPE) { - CMAKE_STATIC_WINDOWS_BUILD = "true" ---- qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf.qtmain 2014-07-05 14:18:23.211155781 +0200 + +--- qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf.orig 2014-07-05 14:18:23.211155781 +0200 +++ qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf 2014-07-05 14:18:46.045390147 +0200 -@@ -6,7 +6,7 @@ +@@ -5,7 +5,7 @@ mingw:DEFINES += QT_NEEDS_QMAIN qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { -- isEqual(entryLib, -lqtmain): { +- isEqual(entryLib, -lqtmain) { + isEqual(entryLib, -lqt5main): { !contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \ QMAKE_LIBS += -L$$QT.core.libs |