| 1 | *** ./tools/assistant/tools/assistant/assistant.pro.org Wed Jan 5 11:25:41 2011 |
|---|
| 2 | --- ./tools/assistant/tools/assistant/assistant.pro Wed Jan 5 11:39:43 2011 |
|---|
| 3 | *************** |
|---|
| 4 | *** 116,118 **** |
|---|
| 5 | --- 116,137 ---- |
|---|
| 6 | } |
|---|
| 7 | linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene |
|---|
| 8 | LIBS_PRIVATE += -l$$qclucene |
|---|
| 9 | + |
|---|
| 10 | + qcnetwork = QtNetwork$${QT_LIBINFIX} |
|---|
| 11 | + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { |
|---|
| 12 | + mac:qcnetwork = $${qcnetwork}_debug |
|---|
| 13 | + win32:qcnetwork = $${qcnetwork}d |
|---|
| 14 | + } |
|---|
| 15 | + linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcnetwork |
|---|
| 16 | + LIBS_PRIVATE += -l$$qcnetwork |
|---|
| 17 | + |
|---|
| 18 | + qcwebkit = QtWebKit$${QT_LIBINFIX} |
|---|
| 19 | + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { |
|---|
| 20 | + mac:qcwebkit = $${qcwebkit}_debug |
|---|
| 21 | + win32:qcwebkit = $${qcwebkit}d |
|---|
| 22 | + } |
|---|
| 23 | + linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit |
|---|
| 24 | + LIBS_PRIVATE += -l$$qcwebkit |
|---|
| 25 | + |
|---|
| 26 | + |
|---|
| 27 | + |
|---|
| 28 | *** ./tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro.org Wed Jan 5 11:25:41 2011 |
|---|
| 29 | --- ./tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro Wed Jan 5 11:39:55 2011 |
|---|
| 30 | *************** |
|---|
| 31 | *** 23,25 **** |
|---|
| 32 | --- 23,41 ---- |
|---|
| 33 | } |
|---|
| 34 | linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene |
|---|
| 35 | LIBS_PRIVATE += -l$$qclucene |
|---|
| 36 | + |
|---|
| 37 | + qcnetwork = QtNetwork$${QT_LIBINFIX} |
|---|
| 38 | + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { |
|---|
| 39 | + mac:qcnetwork = $${qcnetwork}_debug |
|---|
| 40 | + win32:qcnetwork = $${qcnetwork}d |
|---|
| 41 | + } |
|---|
| 42 | + linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcnetwork |
|---|
| 43 | + LIBS_PRIVATE += -l$$qcnetwork |
|---|
| 44 | + |
|---|
| 45 | + qcwebkit = QtWebKit$${QT_LIBINFIX} |
|---|
| 46 | + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { |
|---|
| 47 | + mac:qcwebkit = $${qcwebkit}_debug |
|---|
| 48 | + win32:qcwebkit = $${qcwebkit}d |
|---|
| 49 | + } |
|---|
| 50 | + linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit |
|---|
| 51 | + LIBS_PRIVATE += -l$$qcwebkit |
|---|
| 52 | *** ./tools/assistant/tools/qhelpconverter/qhelpconverter.pro.org Wed Jan 5 11:25:41 2011 |
|---|
| 53 | --- ./tools/assistant/tools/qhelpconverter/qhelpconverter.pro Wed Jan 5 11:40:03 2011 |
|---|
| 54 | *************** |
|---|
| 55 | *** 53,55 **** |
|---|
| 56 | --- 53,71 ---- |
|---|
| 57 | } |
|---|
| 58 | linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene |
|---|
| 59 | LIBS_PRIVATE += -l$$qclucene |
|---|
| 60 | + |
|---|
| 61 | + qcnetwork = QtNetwork$${QT_LIBINFIX} |
|---|
| 62 | + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { |
|---|
| 63 | + mac:qcnetwork = $${qcnetwork}_debug |
|---|
| 64 | + win32:qcnetwork = $${qcnetwork}d |
|---|
| 65 | + } |
|---|
| 66 | + linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcnetwork |
|---|
| 67 | + LIBS_PRIVATE += -l$$qcnetwork |
|---|
| 68 | + |
|---|
| 69 | + qcwebkit = QtWebKit$${QT_LIBINFIX} |
|---|
| 70 | + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { |
|---|
| 71 | + mac:qcwebkit = $${qcwebkit}_debug |
|---|
| 72 | + win32:qcwebkit = $${qcwebkit}d |
|---|
| 73 | + } |
|---|
| 74 | + linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit |
|---|
| 75 | + LIBS_PRIVATE += -l$$qcwebkit |
|---|
| 76 | *** ./tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro.org Wed Jan 5 11:25:41 2011 |
|---|
| 77 | --- ./tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro Wed Jan 5 11:40:10 2011 |
|---|
| 78 | *************** |
|---|
| 79 | *** 20,22 **** |
|---|
| 80 | --- 20,38 ---- |
|---|
| 81 | } |
|---|
| 82 | linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene |
|---|
| 83 | LIBS_PRIVATE += -l$$qclucene |
|---|
| 84 | + |
|---|
| 85 | + qcnetwork = QtNetwork$${QT_LIBINFIX} |
|---|
| 86 | + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { |
|---|
| 87 | + mac:qcnetwork = $${qcnetwork}_debug |
|---|
| 88 | + win32:qcnetwork = $${qcnetwork}d |
|---|
| 89 | + } |
|---|
| 90 | + linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcnetwork |
|---|
| 91 | + LIBS_PRIVATE += -l$$qcnetwork |
|---|
| 92 | + |
|---|
| 93 | + qcwebkit = QtWebKit$${QT_LIBINFIX} |
|---|
| 94 | + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { |
|---|
| 95 | + mac:qcwebkit = $${qcwebkit}_debug |
|---|
| 96 | + win32:qcwebkit = $${qcwebkit}d |
|---|
| 97 | + } |
|---|
| 98 | + linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit |
|---|
| 99 | + LIBS_PRIVATE += -l$$qcwebkit |
|---|
| 100 | *** ./tools/designer/src/plugins/qwebview/qwebview.pro.org Wed Jan 5 11:42:10 2011 |
|---|
| 101 | --- ./tools/designer/src/plugins/qwebview/qwebview.pro Wed Jan 5 11:45:21 2011 |
|---|
| 102 | *************** |
|---|
| 103 | *** 13,15 **** |
|---|
| 104 | --- 13,31 ---- |
|---|
| 105 | SOURCES += qwebview_plugin.cpp |
|---|
| 106 | HEADERS += qwebview_plugin.h |
|---|
| 107 | RESOURCES += qwebview_plugin.qrc |
|---|
| 108 | + |
|---|
| 109 | + qcnetwork = QtNetwork$${QT_LIBINFIX} |
|---|
| 110 | + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { |
|---|
| 111 | + mac:qcnetwork = $${qcnetwork}_debug |
|---|
| 112 | + win32:qcnetwork = $${qcnetwork}d |
|---|
| 113 | + } |
|---|
| 114 | + linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcnetwork |
|---|
| 115 | + LIBS_PRIVATE += -l$$qcnetwork |
|---|
| 116 | + |
|---|
| 117 | + qcwebkit = QtWebKit$${QT_LIBINFIX} |
|---|
| 118 | + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { |
|---|
| 119 | + mac:qcwebkit = $${qcwebkit}_debug |
|---|
| 120 | + win32:qcwebkit = $${qcwebkit}d |
|---|
| 121 | + } |
|---|
| 122 | + linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit |
|---|
| 123 | + LIBS_PRIVATE += -l$$qcwebkit |
|---|
