Parcourir la source

Fix unintended rename of lipstikconf

tags/r14.0.0
Slávek Banko il y a 7 ans
Parent
révision
b5a5082c65
4 fichiers modifiés avec 6 ajouts et 6 suppressions
  1. +2
    -2
      INSTALL
  2. +2
    -2
      style/config/Makefile.am
  3. +2
    -2
      style/config/lipstikconf.cpp
  4. +0
    -0
      style/config/lipstikconf.h

+ 2
- 2
INSTALL Voir le fichier

@@ -67,7 +67,7 @@ out of the box there.

Some people have reported that building fails with errors related to .moc files.
eg:
lipstitdeconf.cpp:479:27: lipstitdeconf.moc: No such file or directory
lipstikconf.cpp:479:27: lipstikconf.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 lipstitdeconf.moc lipstitdeconf.h
moc -o lipstikconf.moc lipstikconf.h

Then run make again, it should work.



+ 2
- 2
style/config/Makefile.am Voir le fichier

@@ -1,10 +1,10 @@
INCLUDES = $(all_includes)

noinst_HEADERS = lipstitdeconf.h
noinst_HEADERS = lipstikconf.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 = lipstitdeconf.cpp
kstyle_lipstik_config_la_SOURCES = lipstikconf.cpp
kstyle_lipstik_config_la_METASOURCES = AUTO




style/config/lipstitdeconf.cpp → style/config/lipstikconf.cpp Voir le fichier

@@ -43,7 +43,7 @@ DEALINGS IN THE SOFTWARE.
#include <tqspinbox.h>
#include <tqgrid.h>

#include "lipstitdeconf.h"
#include "lipstikconf.h"

extern "C"
{
@@ -761,4 +761,4 @@ TQString LipstikStyleConfig::sliderType( int sliderlistnr )
}
}

#include "lipstitdeconf.moc"
#include "lipstikconf.moc"

style/config/lipstitdeconf.h → style/config/lipstikconf.h Voir le fichier


Chargement…
Annuler
Enregistrer