diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-05-07 00:31:43 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-05-07 00:31:43 -0500 |
| commit | dd5447a3f86dd6c9febbd85524f1f1d714744f1c (patch) | |
| tree | 5aacbfdae0a6f1aa5053e8f9828b449b8d3149fd | |
| parent | 7ed40f5c4838488dcda2e3529cffd273a414c018 (diff) | |
| download | qt4-tqt-theme-engine-dd5447a3.tar.gz qt4-tqt-theme-engine-dd5447a3.zip | |
Split TDE/Qt4 interface library out and install files into correct locations
| -rw-r--r-- | lib/lib.pro | 16 | ||||
| -rw-r--r-- | lib/tdeqt4painter.cpp (renamed from plugin/tdeqt4painter.cpp) | 0 | ||||
| -rw-r--r-- | lib/tdeqt4painter.h (renamed from plugin/tdeqt4painter.h) | 0 | ||||
| -rw-r--r-- | plugin/plugin.pro | 16 | ||||
| -rw-r--r-- | styleplugin.pro | 7 |
5 files changed, 24 insertions, 15 deletions
diff --git a/lib/lib.pro b/lib/lib.pro new file mode 100644 index 0000000..e9dd9b7 --- /dev/null +++ b/lib/lib.pro @@ -0,0 +1,16 @@ +#! [0] +TEMPLATE = lib +HEADERS = tdeqt4painter.h +SOURCES = tdeqt4painter.cpp +TARGET = tdeqt4interface + +INCLUDEPATH += /usr/include/tqt3 +INCLUDEPATH += /usr/include/tqt3/private +INCLUDEPATH += /usr/include/tqt +INCLUDEPATH += /opt/trinity/include +LIBS += -L/usr/lib -ltqt -ltqt-mt -L /opt/trinity/lib -lDCOP -ltdecore -ltdeui -lkio + +# install +target.path = $$[QT_INSTALL_LIBS]/styles +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS +INSTALLS += target sources diff --git a/plugin/tdeqt4painter.cpp b/lib/tdeqt4painter.cpp index 6c8d4c0..6c8d4c0 100644 --- a/plugin/tdeqt4painter.cpp +++ b/lib/tdeqt4painter.cpp diff --git a/plugin/tdeqt4painter.h b/lib/tdeqt4painter.h index ccb5f70..ccb5f70 100644 --- a/plugin/tdeqt4painter.h +++ b/lib/tdeqt4painter.h diff --git a/plugin/plugin.pro b/plugin/plugin.pro index 272623c..488274a 100644 --- a/plugin/plugin.pro +++ b/plugin/plugin.pro @@ -2,25 +2,19 @@ TEMPLATE = lib CONFIG += plugin HEADERS = simplestyle.h \ - simplestyleplugin.h \ - tdeqt4painter.h + simplestyleplugin.h SOURCES = simplestyle.cpp \ - simplestyleplugin.cpp \ - tdeqt4painter.cpp + simplestyleplugin.cpp TARGET = simplestyleplugin INCLUDEPATH += /usr/include/tqt3 INCLUDEPATH += /usr/include/tqt3/private INCLUDEPATH += /usr/include/tqt INCLUDEPATH += /opt/trinity/include -LIBS += -L/usr/lib -ltqt -ltqt-mt -L /opt/trinity/lib -lDCOP -ltdecore -ltdeui -lkio - -#! [0] -DESTDIR = ../styles/ +INCLUDEPATH += ../lib +LIBS += -L/usr/lib -ltqt -ltqt-mt -L/opt/trinity/lib -lDCOP -ltdecore -ltdeui -lkio -L../lib -ltdeqt4interface # install -# target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin/styles target.path = $$[QT_INSTALL_PLUGINS]/styles sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin/plugin -INSTALLS += target sources +INSTALLS += target diff --git a/styleplugin.pro b/styleplugin.pro index 2bfa0fd..b769803 100644 --- a/styleplugin.pro +++ b/styleplugin.pro @@ -1,8 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = plugin +SUBDIRS = lib plugin # install -target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin +target.path = $$[QT_INSTALL_PLUGINS]/styles sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styleplugin.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin -INSTALLS += target sources +INSTALLS += target |