diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:32 -0600 |
| commit | 9def762d42a0abf4f56a29ecb4e9672e33bf2515 (patch) | |
| tree | f2f7c09154e9009a82f30b2cb69d71139893c6da | |
| parent | 31ae3c8d10e5aabaa70e64199f3cef4205309584 (diff) | |
| download | tde-style-lipstik-9def762d.tar.gz tde-style-lipstik-9def762d.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | style/config/Makefile.am | 4 | ||||
| -rw-r--r-- | style/config/lipstitdeconf.cpp (renamed from style/config/lipstikconf.cpp) | 4 | ||||
| -rw-r--r-- | style/config/lipstitdeconf.h (renamed from style/config/lipstikconf.h) | 0 |
4 files changed, 6 insertions, 6 deletions
@@ -67,7 +67,7 @@ out of the box there. Some people have reported that building fails with errors related to .moc files. eg: - lipstikconf.cpp:479:27: lipstikconf.moc: No such file or directory + lipstitdeconf.cpp:479:27: lipstitdeconf.moc: No such file or directory If this happens to you, dont panic. In the source dir, there are style and style/config subdirs: @@ -76,7 +76,7 @@ In the source dir, there are style and style/config subdirs: moc -o lipstik.moc lipstik.h And then in the style/config subdir do - moc -o lipstikconf.moc lipstikconf.h + moc -o lipstitdeconf.moc lipstitdeconf.h Then run make again, it should work. diff --git a/style/config/Makefile.am b/style/config/Makefile.am index de50a34..e7bfd9f 100644 --- a/style/config/Makefile.am +++ b/style/config/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = $(all_includes) -noinst_HEADERS = lipstikconf.h +noinst_HEADERS = lipstitdeconf.h kde_module_LTLIBRARIES = kstyle_lipstik_config.la kstyle_lipstik_config_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(KDE_PLUGIN) -module kstyle_lipstik_config_la_LIBADD = $(LIB_TDEUI) -kstyle_lipstik_config_la_SOURCES = lipstikconf.cpp +kstyle_lipstik_config_la_SOURCES = lipstitdeconf.cpp kstyle_lipstik_config_la_METASOURCES = AUTO diff --git a/style/config/lipstikconf.cpp b/style/config/lipstitdeconf.cpp index 5592590..d086349 100644 --- a/style/config/lipstikconf.cpp +++ b/style/config/lipstitdeconf.cpp @@ -43,7 +43,7 @@ DEALINGS IN THE SOFTWARE. #include <tqspinbox.h> #include <tqgrid.h> -#include "lipstikconf.h" +#include "lipstitdeconf.h" extern "C" { @@ -761,4 +761,4 @@ TQString LipstikStyleConfig::sliderType( int sliderlistnr ) } } -#include "lipstikconf.moc" +#include "lipstitdeconf.moc" diff --git a/style/config/lipstikconf.h b/style/config/lipstitdeconf.h index 2a88ba4..2a88ba4 100644 --- a/style/config/lipstikconf.h +++ b/style/config/lipstitdeconf.h |