diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-27 20:55:12 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-27 20:55:12 -0600 |
| commit | 992df30f3c50b5439c2b5f8621ab6e928d9346eb (patch) | |
| tree | acdd3b48b9f30eeda4f94092172ffb3042fca766 /src/kernel/qt_kernel.pri | |
| parent | 74ce99a42a0dc9d9a168156a2f5d146edb9bb555 (diff) | |
| parent | 84f70969d95344d402d6f6152a6373469a3718ca (diff) | |
| download | tqt-992df30f3c50b5439c2b5f8621ab6e928d9346eb.tar.gz tqt-992df30f3c50b5439c2b5f8621ab6e928d9346eb.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/qt_kernel.pri')
| -rw-r--r-- | src/kernel/qt_kernel.pri | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri index 0c3b867c7..d589cdf27 100644 --- a/src/kernel/qt_kernel.pri +++ b/src/kernel/qt_kernel.pri @@ -21,7 +21,7 @@ kernel { $$KERNEL_H/ntqdrawutil.h \ $$KERNEL_H/ntqdropsite.h \ $$KERNEL_H/ntqevent.h \ - $$KERNEL_H/ntqeventloop.h\ + $$KERNEL_H/ntqeventloop.h \ $$KERNEL_P/qeventloop_p.h \ $$KERNEL_H/ntqfocusdata.h \ $$KERNEL_H/ntqfont.h \ @@ -104,6 +104,10 @@ kernel { HEADERS += $$KERNEL_P/qinputcontext_p.h } + glibmainloop { + HEADERS+=$$KERNEL_P/qeventloop_glib_p.h + } + win32:SOURCES += $$KERNEL_CPP/qapplication_win.cpp \ $$KERNEL_CPP/qclipboard_win.cpp \ $$KERNEL_CPP/qcolor_win.cpp \ @@ -133,7 +137,6 @@ kernel { $$KERNEL_CPP/qcursor_x11.cpp \ $$KERNEL_CPP/qdnd_x11.cpp \ $$KERNEL_CPP/qdesktopwidget_x11.cpp \ - $$KERNEL_CPP/qeventloop_x11.cpp \ $$KERNEL_CPP/qfont_x11.cpp \ $$KERNEL_CPP/qinputcontext.cpp \ $$KERNEL_CPP/qinputcontext_x11.cpp \ @@ -146,6 +149,12 @@ kernel { $$KERNEL_CPP/qwidget_x11.cpp \ $$KERNEL_CPP/qwidgetcreate_x11.cpp \ $$KERNEL_CPP/qfontengine_x11.cpp + glibmainloop { + SOURCES += $$KERNEL_CPP/qeventloop_x11_glib.cpp + } else { + SOURCES += $$KERNEL_CPP/qeventloop_x11.cpp + } + } !x11:mac { @@ -172,8 +181,13 @@ kernel { DEFINES += QMAC_ONE_PIXEL_LOCK } else:unix { SOURCES += $$KERNEL_CPP/qprinter_unix.cpp \ - $$KERNEL_CPP/qpsprinter.cpp \ - $$KERNEL_CPP/qeventloop_unix.cpp + $$KERNEL_CPP/qpsprinter.cpp + glibmainloop { + SOURCES += $$KERNEL_CPP/qeventloop_unix_glib.cpp + } else { + SOURCES += $$KERNEL_CPP/qeventloop_unix.cpp + } + } unix:SOURCES += $$KERNEL_CPP/qprocess_unix.cpp \ $$KERNEL_CPP/qthread_unix.cpp |