osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
42,547 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

16 Commits

Author SHA1 Message Date
Jörg Mayer e3d925b1ff The proper way to set compiler flags in cmake is not by using 
add_definitions() but the variables CMAKE_C{,XX}_FLAGS. Set these
flags correctly at the toplevel, so no hack in the ui/qt/ subdir
is required anymore.

svn path=/trunk/; revision=44633
 2012-08-23 12:30:16 +00:00
Jörg Mayer b43901043a Remove commented out rules 
Whitespace fixes

svn path=/trunk/; revision=44629
 2012-08-23 10:34:45 +00:00
Jörg Mayer 11b1de0cdf Fixes for warnings: unused-but-set-variable 
svn path=/trunk/; revision=44628
 2012-08-23 10:30:37 +00:00
Jörg Mayer 2fdb1aca60 Make cmake build qtshark again 
svn path=/trunk/; revision=44566
 2012-08-18 19:40:12 +00:00
Jörg Mayer ed6e29eac6 Try to copy over the changes to QtShark.pro to automake and cmake. 
Note: It still fails with
Linking CXX executable qtshark
lib/libqtui.a(interface_tree.cpp.o): In function `SparkLineDelegate':
/home/jmayer/work/wireshark/svn/trunk/ui/qt/sparkline_delegate.h:10: undefined reference to `vtable for SparkLineDelegate'
collect2: error: ld returned 1 exit status


svn path=/trunk/; revision=44257
 2012-08-04 00:31:31 +00:00
Jörg Mayer ffb4be37a6 Make the changes of r44165 build with autofoo and cmake as well 
svn path=/trunk/; revision=44190
 2012-08-01 18:27:57 +00:00
Jörg Mayer 964008c959 Add qtshark_de.ts 
svn path=/trunk/; revision=43857
 2012-07-20 11:59:25 +00:00
Jörg Mayer 0062536fa8 progress_dialog.* -> progress_bar.* 
svn path=/trunk/; revision=43852
 2012-07-20 10:35:51 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address. 
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
 2012-06-28 22:56:06 +00:00
Alexis La Goutte e17397b721 From Joerg Mayer 
Add i18n to Cmake

svn path=/trunk/; revision=41390
 2012-03-07 10:23:50 +00:00
Jörg Mayer 0d0b51e56b Don't forget about the .qrc files. 
There is nothing to install for the qt gui right now.

svn path=/trunk/; revision=40826
 2012-02-03 17:40:55 +00:00
Jörg Mayer d987442264 Add a comment about automoc (but don't use it as this would 
force everyone to use a rather recent cmake).

svn path=/trunk/; revision=40815
 2012-02-02 21:33:37 +00:00
Jörg Mayer 33b8433336 Fix make install for qtshark. 
svn path=/trunk/; revision=40814
 2012-02-02 21:21:04 +00:00
Jörg Mayer c3dea73ade Make out-of-tree builds work. 
svn path=/trunk/; revision=40809
 2012-02-02 12:38:04 +00:00
Jörg Mayer 137f3fc455 - Move setting _U_ into config.h, because 
a) C++ has a standardized way of marking parameters as unused
  b) cmakes autoquoting magic failed when the compiler wasn't gcc
     but moc instead.
- qtshark: Don't try to compile the c source files inside ui/qt/
- qtshark: Only run moc on the files that need it.
- qtshark: It's too early to try any of the new qtshark files
  as clean.
- Make Qt detection actually work
- Add C++ to the list of languages for this project

svn path=/trunk/; revision=40807
 2012-02-02 12:04:22 +00:00
Jörg Mayer f628ed7aec Update svn:ignore for existing qtshark build process 
svn path=/trunk/; revision=40805
 2012-02-02 08:55:00 +00:00