diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 13:05:02 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 13:05:02 +0200 |
| commit | ca524e5b70ccfeb6386cf0c5df83ffb86a8771fe (patch) | |
| tree | 245c471373516ccda2b0c91943a42cd74674f2da /src/winmain | |
| parent | b08cc0ec6f096d0e6764486c81264c24a406bee1 (diff) | |
| parent | c2badc7423b63824902d1f44a4b804de3335c20b (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Manually included changes from
3a347a4e70e5a10ee92dd2578316c926a399e894
in src/opengl/qgl.cpp.
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/android/androidjnimain.cpp
Change-Id: Ic26b58ee587d4884c9d0fba45c5a94b5a45ee929
Diffstat (limited to 'src/winmain')
| -rw-r--r-- | src/winmain/winmain.pro | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index 284f2a2201..b891e4bce0 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -29,10 +29,7 @@ load(qt_installs) TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end load(qt_targets) +load(qt_build_paths) +load(qt_common) wince*:QMAKE_POST_LINK = - -lib_replace.match = $$[QT_INSTALL_LIBS/get] -lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -lib_replace.CONFIG = path -QMAKE_PRL_INSTALL_REPLACE += lib_replace |