diff options
author | Timothy Pearson <[email protected]> | 2012-11-26 22:38:07 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2012-11-26 22:38:07 -0600 |
commit | de67a2b84b0d8b8ef994e91c108af3273e2ac37f (patch) | |
tree | 62758d4b374f0c6c0f5acf6cf99c27ff1a1fbf15 /src/kernel/qt_kernel.pri | |
parent | b5d6591054de1d4f66280207023c43e9e191146c (diff) | |
download | qt3-de67a2b84b0d8b8ef994e91c108af3273e2ac37f.tar.gz qt3-de67a2b84b0d8b8ef994e91c108af3273e2ac37f.zip |
Add glib main loop support patches
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 5a89e08..b72220f 100644 --- a/src/kernel/qt_kernel.pri +++ b/src/kernel/qt_kernel.pri @@ -21,7 +21,7 @@ kernel { $$KERNEL_H/qdrawutil.h \ $$KERNEL_H/qdropsite.h \ $$KERNEL_H/qevent.h \ - $$KERNEL_H/qeventloop.h\ + $$KERNEL_H/qeventloop.h \ $$KERNEL_P/qeventloop_p.h \ $$KERNEL_H/qfocusdata.h \ $$KERNEL_H/qfont.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 |