projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing Topic Widget (vertical centering, scrolling and doubleclickination)
[quassel.git]
/
src
/
qtui
/
CMakeLists.txt
diff --git
a/src/qtui/CMakeLists.txt
b/src/qtui/CMakeLists.txt
index
3a17781
..
1bb30fe
100644
(file)
--- a/
src/qtui/CMakeLists.txt
+++ b/
src/qtui/CMakeLists.txt
@@
-7,9
+7,9
@@
include(${QT_USE_FILE})
set(SOURCES
aboutdlg.cpp
bufferwidget.cpp
set(SOURCES
aboutdlg.cpp
bufferwidget.cpp
+ channellistdlg.cpp
coreconfigwizard.cpp
coreconnectdlg.cpp
coreconfigwizard.cpp
coreconnectdlg.cpp
- configwizard.cpp
debugconsole.cpp
inputwidget.cpp
jumpkeyhandler.cpp
debugconsole.cpp
inputwidget.cpp
jumpkeyhandler.cpp
@@
-21,16
+21,16
@@
set(SOURCES
settingsdlg.cpp
settingspagedlg.cpp
titlesetter.cpp
settingsdlg.cpp
settingspagedlg.cpp
titlesetter.cpp
- topic
button
.cpp
+ topic
label
.cpp
topicwidget.cpp
verticaldock.cpp)
topicwidget.cpp
verticaldock.cpp)
-set(
HEADE
RS
+set(
MOC_HD
RS
aboutdlg.h
bufferwidget.h
aboutdlg.h
bufferwidget.h
+ channellistdlg.h
coreconfigwizard.h
coreconnectdlg.h
coreconfigwizard.h
coreconnectdlg.h
- configwizard.h
debugconsole.h
inputwidget.h
jumpkeyhandler.h
debugconsole.h
inputwidget.h
jumpkeyhandler.h
@@
-40,23
+40,29
@@
set(HEADERS
settingsdlg.h
settingspagedlg.h
titlesetter.h
settingsdlg.h
settingspagedlg.h
titlesetter.h
- topic
button
.h
+ topic
label
.h
topicwidget.h
verticaldock.h)
topicwidget.h
verticaldock.h)
+set(HEADERS
+ qtuisettings.h
+ qtuistyle.h)
+
if(SPUTDEV)
set(SOURCES ${SOURCES} chatitem.cpp chatline.cpp chatlinemodelitem.cpp
chatlinemodel.cpp chatscene.cpp chatview.cpp)
if(SPUTDEV)
set(SOURCES ${SOURCES} chatitem.cpp chatline.cpp chatlinemodelitem.cpp
chatlinemodel.cpp chatscene.cpp chatview.cpp)
- set(HEADERS ${HEADERS} chatlinemodel.h chatscene.h chatview.h)
+ set(MOC_HDRS ${MOC_HDRS} chatlinemodel.h chatscene.h chatview.h)
+ set(HEADERS ${HEADERS} chatitem.h chatline.h chatlinemodelitem.h)
else(SPUTDEV)
set(SOURCES ${SOURCES} chatline-old.cpp chatwidget.cpp)
else(SPUTDEV)
set(SOURCES ${SOURCES} chatline-old.cpp chatwidget.cpp)
- set(
HEADERS ${HEADE
RS} chatline-old.h chatwidget.h)
+ set(
MOC_HDRS ${MOC_HD
RS} chatline-old.h chatwidget.h)
endif(SPUTDEV)
set(FORMS
aboutdlg.ui
bufferviewwidget.ui
bufferwidget.ui
endif(SPUTDEV)
set(FORMS
aboutdlg.ui
bufferviewwidget.ui
bufferwidget.ui
+ channellistdlg.ui
coreaccounteditdlg.ui
coreconfigwizardintropage.ui
coreconfigwizardadminuserpage.ui
coreaccounteditdlg.ui
coreconfigwizardintropage.ui
coreconfigwizardadminuserpage.ui
@@
-93,7
+99,7
@@
foreach(FRM ${SP_FORMS})
endforeach(FRM ${SP_FORMS})
endforeach(FRM ${SP_FORMS})
-qt4_wrap_cpp(MOC ${
HEADE
RS} ${SPHDR})
+qt4_wrap_cpp(MOC ${
MOC_HD
RS} ${SPHDR})
qt4_wrap_ui(UI ${FORMPATH} ${SPFRM})
include_directories(${CMAKE_SOURCE_DIR}/src/common
qt4_wrap_ui(UI ${FORMPATH} ${SPFRM})
include_directories(${CMAKE_SOURCE_DIR}/src/common
@@
-102,5
+108,5
@@
include_directories(${CMAKE_SOURCE_DIR}/src/common
${CMAKE_SOURCE_DIR}/src/uisupport
${CMAKE_CURRENT_BINARY_DIR})
${CMAKE_SOURCE_DIR}/src/uisupport
${CMAKE_CURRENT_BINARY_DIR})
-add_library(mod_qtui STATIC ${SOURCES} ${SPSRC} ${MOC} ${UI})
+add_library(mod_qtui STATIC ${SOURCES} ${SPSRC} ${MOC} ${UI}
${HEADERS}
)
add_dependencies(mod_qtui mod_common mod_client mod_uisupport)
add_dependencies(mod_qtui mod_common mod_client mod_uisupport)