]>
Commit | Line | Data |
---|---|---|
d86befc1 JB |
1 | --- QScintilla-gpl-2.8.4/Qt4Qt5/qscintilla.pro.orig 2014-09-11 19:15:15.000000000 +0200 |
2 | +++ QScintilla-gpl-2.8.4/Qt4Qt5/qscintilla.pro 2014-11-03 20:11:22.685915741 +0100 | |
3 | @@ -28,7 +28,7 @@ | |
4 | !win32:VERSION = 11.3.0 | |
5 | ||
6 | TEMPLATE = lib | |
7 | -TARGET = qscintilla2 | |
8 | +TARGET = qscintilla2-qt$$QT_MAJOR_VERSION | |
9 | CONFIG += qt warn_off release thread exceptions | |
10 | INCLUDEPATH += . ../include ../lexlib ../src | |
11 | ||
12 | --- QScintilla-gpl-2.8.4/Qt4Qt5/features/qscintilla2.prf.orig 2014-09-11 19:15:15.000000000 +0200 | |
13 | +++ QScintilla-gpl-2.8.4/Qt4Qt5/features/qscintilla2.prf 2014-11-03 20:35:52.655854645 +0100 | |
14 | @@ -6,20 +6,22 @@ | |
15 | } | |
16 | } | |
17 | ||
18 | +QTSUF = -qt$QT_MAJOR_VERSION | |
19 | + | |
20 | INCLUDEPATH += $$[QT_INSTALL_HEADERS] | |
21 | ||
22 | LIBS += -L$$[QT_INSTALL_LIBS] | |
23 | ||
24 | CONFIG(debug, debug|release) { | |
25 | mac: { | |
26 | - LIBS += -lqscintilla2_debug | |
27 | + LIBS += -lqscintilla2$$[QTSUF]_debug | |
28 | } else { | |
29 | win32: { | |
30 | - LIBS += -lqscintilla2d | |
31 | + LIBS += -lqscintilla2$$[QTSUF]d | |
32 | } else { | |
33 | - LIBS += -lqscintilla2 | |
34 | + LIBS += -lqscintilla2$$[QTSUF] | |
35 | } | |
36 | } | |
37 | } else { | |
38 | - LIBS += -lqscintilla2 | |
39 | + LIBS += -lqscintilla2$$[QTSUF] | |
40 | } |