Attachment 1714 Details for Bug 1761 – tqtinterface : Not build tqassistantclient for native tqt, embed static library for qt3

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tqtinterface : Not build tqassistantclient for native tqt, embed static library for qt3

tqtinterface-tqassistantclient-1.diff (text/plain), 1.29 KB, created by Slávek Banko on 2013-12-09 20:30:18 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2013-12-09 20:30:18 CST

Size: 1.29 KB

patch

obsolete

>diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt
>index 30f4020..454c13a 100644
>--- a/qtinterface/CMakeLists.txt
>+++ b/qtinterface/CMakeLists.txt
>@@ -217,11 +217,35 @@ tde_add_library( tqt SHARED
> 
> ##### tqassistantclient (shared) ##############################
> 
>+if ( NOT HAVE_REAL_TQT )
> 
>-tde_add_library( tqassistantclient SHARED
>-  SOURCES
>-    ${IFACE}/tqassistantclient.cpp
>-  VERSION 4.2.0
>-  LINK ${QT_LIBRARIES} -ltqassistantclient
>-  DESTINATION ${LIB_INSTALL_DIR}
>-)
>+  find_library( QASSISTANTCLIENT_STATIC libqassistantclient.a )
>+
>+  if ( QASSISTANTCLIENT_STATIC )
>+
>+    add_library(qassistantclient STATIC IMPORTED)
>+    set_property(TARGET qassistantclient PROPERTY
>+                 IMPORTED_LOCATION ${QASSISTANTCLIENT_STATIC})
>+
>+    tde_add_library( tqassistantclient SHARED
>+      SOURCES
>+        ${IFACE}/tqassistantclient.cpp
>+      VERSION 4.2.0
>+      LINK ${QT_LIBRARIES}
>+      EMBED qassistantclient
>+      DESTINATION ${LIB_INSTALL_DIR}
>+    )
>+
>+  else ( QASSISTANTCLIENT_STATIC )
>+
>+    tde_add_library( tqassistantclient SHARED
>+      SOURCES
>+        ${IFACE}/tqassistantclient.cpp
>+      VERSION 4.2.0
>+      LINK ${QT_LIBRARIES} -lqassistantclient
>+      DESTINATION ${LIB_INSTALL_DIR}
>+    )
>+
>+  endif ( QASSISTANTCLIENT_STATIC )
>+
>+endif ( NOT HAVE_REAL_TQT )

Actions: View | Diff

Attachments on bug 1761: 1706 | 1709 | 1710 | 1711 | 1712 | 1713 | 1714