MonkeyStudio: move to Qt5

This commit is contained in:
Sergei Reznikov
2017-11-14 14:51:52 +03:00
parent 6575dd5182
commit 293534dcf0
3 changed files with 57 additions and 40 deletions

View File

@@ -9,17 +9,18 @@ Our GCC4 doesn't support this and throws an error.
1 file changed, 1 deletion(-)
diff --git a/monkey/monkey.pro b/monkey/monkey.pro
index e006f70..a11d135 100644
index a5f6cfc..bd7910f 100644
--- a/monkey/monkey.pro
+++ b/monkey/monkey.pro
@@ -20,7 +20,6 @@ LIBS *= -L$${PACKAGE_BUILD_PATH}/$${Q_TARGET_ARCH}/$$buildMode()
mac:*-g++*:LIBS *= -Wl,-all_load # import all symbols as the not used ones too
else:*-g++*:LIBS *= -Wl,--whole-archive # import all symbols as the not used ones too
mac:*-g++*:LIBS *= -dynamic
-else:unix:*-g++*:LIBS *= -rdynamic
# include qscintilla framework
include( ../qscintilla/qscintilla.pri )
@@ -28,7 +28,7 @@ mac {
} else {
*-*g++* {
LIBS *= -Wl,--whole-archive # import all symbols as the not used ones too
- unix:LIBS *= -rdynamic
+ unix:LIBS *=
} else:*-*clang* {
LIBS *= -Wl,--whole-archive # import all symbols as the not used ones too
unix:LIBS *= -rdynamic
--
1.8.3.4