diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
| commit | 4456984da780b14572e1ec0f079a4d349ab299bd (patch) | |
| tree | f586a281a81c57c91c49e83a5d3ec6c7eece0578 /mkspecs/common/wince/qmake.conf | |
| parent | e824abd987d77efaa085fe1f9fb514d270798d55 (diff) | |
| parent | 281121697340084f7d385eab530f41916789b94d (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
Diffstat (limited to 'mkspecs/common/wince/qmake.conf')
| -rw-r--r-- | mkspecs/common/wince/qmake.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf index 3eac38f6b7..224c350e2f 100644 --- a/mkspecs/common/wince/qmake.conf +++ b/mkspecs/common/wince/qmake.conf @@ -62,6 +62,9 @@ QMAKE_LFLAGS_LTCG = /LTCG QMAKE_LIBS_NETWORK = ws2.lib QMAKE_LIBS_OPENGL = QMAKE_LIBS_COMPAT = +QMAKE_PREFIX_SHLIB = +QMAKE_EXTENSION_SHLIB = dll +QMAKE_PREFIX_STATICLIB = QMAKE_EXTENSION_STATICLIB = lib QMAKE_LIBS_EGL = libEGL.lib |