summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2018-09-27 14:18:53 +0900
committerMichele Calgaro <[email protected]>2018-09-27 14:18:53 +0900
commitd416a4c1f4faf859a35dea2a51223e65a21039e8 (patch)
tree6ac498517d1adbb8ebf43f03d6340ecd25f65e5b
parent92e2e914684923cb565b256748df2c02e27d0519 (diff)
downloadtdebase-d416a4c1f4faf859a35dea2a51223e65a21039e8.tar.gz
tdebase-d416a4c1f4faf859a35dea2a51223e65a21039e8.zip
qt -> tqt conversion:
qtlib -> tqtlib libqt -> libtqt QTLIB -> TQTLIB LIBQT -> LIBTQT Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r--tqt3integration/CMakeLists.txt2
-rw-r--r--tqt3integration/Makefile.am2
-rw-r--r--tqt3integration/libqtkde/CMakeLists.txt2
-rw-r--r--tqt3integration/libqtkde/Makefile.am8
-rw-r--r--tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/tqt3integration/CMakeLists.txt b/tqt3integration/CMakeLists.txt
index 01ce8a76b..07c10e17e 100644
--- a/tqt3integration/CMakeLists.txt
+++ b/tqt3integration/CMakeLists.txt
@@ -9,6 +9,6 @@
#
#################################################
-add_subdirectory( libqtkde )
+add_subdirectory( libtqtkde )
add_subdirectory( module )
add_subdirectory( utils ) \ No newline at end of file
diff --git a/tqt3integration/Makefile.am b/tqt3integration/Makefile.am
index dc0a666a1..6d657bd40 100644
--- a/tqt3integration/Makefile.am
+++ b/tqt3integration/Makefile.am
@@ -1 +1 @@
-SUBDIRS = libqtkde module utils
+SUBDIRS = libtqtkde module utils
diff --git a/tqt3integration/libqtkde/CMakeLists.txt b/tqt3integration/libqtkde/CMakeLists.txt
index 44952e35f..e6ecc6ad3 100644
--- a/tqt3integration/libqtkde/CMakeLists.txt
+++ b/tqt3integration/libqtkde/CMakeLists.txt
@@ -22,7 +22,7 @@ link_directories(
${TQT_LIBRARY_DIRS}
)
-##### libqtkde (shared) ####################
+##### libtqtkde (shared) ####################
tde_add_library( qtkde SHARED AUTOMOC
SOURCES qtkde.cpp
diff --git a/tqt3integration/libqtkde/Makefile.am b/tqt3integration/libqtkde/Makefile.am
index 8675e19dd..d294a1209 100644
--- a/tqt3integration/libqtkde/Makefile.am
+++ b/tqt3integration/libqtkde/Makefile.am
@@ -1,8 +1,8 @@
-qtkdelib_LTLIBRARIES = libqtkde.la
+qtkdelib_LTLIBRARIES = libtqtkde.la
-libqtkde_la_SOURCES = qtkde.cpp
-libqtkde_la_LIBADD = -lDCOP
-libqtkde_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version
+libtqtkde_la_SOURCES = qtkde.cpp
+libtqtkde_la_LIBADD = -lDCOP
+libtqtkde_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version
CLEANFILES = qtkde_functions.cpp
diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp
index 947109afd..36d4e075c 100644
--- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp
+++ b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp
@@ -48,7 +48,7 @@ static TQCString findLibrary()
if( getenv( "TQT_NO_KDE_INTEGRATION" ) == NULL
|| getenv( "TQT_NO_KDE_INTEGRATION" )[ 0 ] == '0' )
{
- return TQCString( TQTKDELIBDIR ) + "/libqtkde";
+ return TQCString( TQTKDELIBDIR ) + "/libtqtkde";
}
return "";
}