equal
deleted
inserted
replaced
22 QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib $$QMAKE_FRAMEWORKPATH |
22 QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib $$QMAKE_FRAMEWORKPATH |
23 } else { |
23 } else { |
24 win32-*|wince* { |
24 win32-*|wince* { |
25 !CONFIG(release, debug|release):build_pass: QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d |
25 !CONFIG(release, debug|release):build_pass: QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d |
26 QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}$${QT_MAJOR_VERSION} |
26 QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}$${QT_MAJOR_VERSION} |
27 win32-g++: LIBS += -l$$QTWEBKITLIBNAME |
27 win32-g++*: LIBS += -l$$QTWEBKITLIBNAME |
28 else: LIBS += $${QTWEBKITLIBNAME}.lib |
28 else: LIBS += $${QTWEBKITLIBNAME}.lib |
29 } else { |
29 } else { |
30 LIBS += -lQtWebKit |
30 LIBS += -lQtWebKit |
31 symbian { |
31 symbian { |
32 TARGET.EPOCSTACKSIZE = 0x14000 // 80 kB |
32 TARGET.EPOCSTACKSIZE = 0x14000 // 80 kB |
33 TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB |
33 TARGET.EPOCHEAPSIZE = 0x20000 0x6000000 // Min 128kB, Max 32MB |
34 } |
34 } |
35 } |
35 } |
36 } |
36 } |
37 } |
37 } |
38 DEPENDPATH += $$PWD/WebKit/qt/Api |
38 DEPENDPATH += $$PWD/WebKit/qt/Api |
46 CONFIG(release, debug|release) { |
46 CONFIG(release, debug|release) { |
47 DEFINES += NDEBUG |
47 DEFINES += NDEBUG |
48 } |
48 } |
49 |
49 |
50 BASE_DIR = $$PWD |
50 BASE_DIR = $$PWD |
51 INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit |
51 |
|
52 symbian { |
|
53 INCLUDEPATH += $$PWD/include/QtWebKit |
|
54 } else { |
|
55 INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit |
|
56 } |
52 |
57 |
53 CONFIG -= warn_on |
58 CONFIG -= warn_on |
54 *-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self |
59 *-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self |
55 |
60 |
56 # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT |
61 # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT |